diff options
Diffstat (limited to 'user/settings/git.nix')
| -rw-r--r-- | user/settings/git.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/user/settings/git.nix b/user/settings/git.nix index 4726120c..769b3728 100644 --- a/user/settings/git.nix +++ b/user/settings/git.nix @@ -19,6 +19,8 @@ }; advice = { addEmptyPathspec = false; + detachedHead = false; + mergeConflict = false; }; ghq = { root = "${config.home.homeDirectory}/projects"; |