diff options
author | Arnold Sommerfeld <sommerfeld@strisemarx.com> | 2023-11-17 09:03:21 +0000 |
---|---|---|
committer | Arnold Sommerfeld <sommerfeld@strisemarx.com> | 2023-11-17 09:03:21 +0000 |
commit | 0992a23018646f793c042fe40a18efc7cddd0cc8 (patch) | |
tree | 59b67b2781fbb8289cd4a16de335868d4271e9cb /home | |
parent | f2aee52ba98af37d66016c442b44069ecb45f4f3 (diff) | |
download | dotfiles-0992a23018646f793c042fe40a18efc7cddd0cc8.tar.gz dotfiles-0992a23018646f793c042fe40a18efc7cddd0cc8.tar.bz2 dotfiles-0992a23018646f793c042fe40a18efc7cddd0cc8.zip |
Remove autoMerge
Diffstat (limited to 'home')
-rw-r--r-- | home/.config/git/config | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/home/.config/git/config b/home/.config/git/config index d3c55dd..8e0a8d9 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -11,7 +11,6 @@ autocrlf = input pager = delta [branch] - autoSetupMerge = false sort=-committerdate [web] browser = librewolf |