diff options
| -rw-r--r-- | .config/git/config | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.config/git/config b/.config/git/config index 7409bda..0cc4236 100644 --- a/.config/git/config +++ b/.config/git/config @@ -40,8 +40,6 @@ # show short ref names but only in terminal decorate = auto [merge] - # only do fastforward merges - ff = only # use vimdiff as mergetool tool = vimdiff [pretty] |