diff options
| author | Alan Pearce | 2024-06-18 20:28:44 +0200 |
|---|---|---|
| committer | Alan Pearce | 2024-06-18 20:28:59 +0200 |
| commit | e9d62e56f73a1ecc772073ab3ce2705abf153028 (patch) | |
| tree | 04081c8da28825677f397b1912026967b74f55b4 /user/settings | |
| parent | bd10447989c1695323e33c75bdbd9dd4ebcbd8aa (diff) | |
| download | nixfiles-e9d62e56f73a1ecc772073ab3ce2705abf153028.tar.lz nixfiles-e9d62e56f73a1ecc772073ab3ce2705abf153028.tar.zst nixfiles-e9d62e56f73a1ecc772073ab3ce2705abf153028.zip | |
git: don't give me advice about merge conflicts
Diffstat (limited to 'user/settings')
| -rw-r--r-- | user/settings/git.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/user/settings/git.nix b/user/settings/git.nix index 4726120c..463b5645 100644 --- a/user/settings/git.nix +++ b/user/settings/git.nix @@ -19,6 +19,7 @@ }; advice = { addEmptyPathspec = false; + mergeConflict = false; }; ghq = { root = "${config.home.homeDirectory}/projects"; |