diff options
| -rw-r--r-- | .config/git/config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config index ff2d46b..e830e43 100644 --- a/.config/git/config +++ b/.config/git/config @@ -16,6 +16,7 @@ l = log --all --oneline --graph --decorate [pull] # rebase = true + ff = only [merge] conflictstyle = zdiff3 ff = only |