diff options
| -rw-r--r-- | .config/git/config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.config/git/config b/.config/git/config index 5fc98ca..ff2d46b 100644 --- a/.config/git/config +++ b/.config/git/config @@ -14,9 +14,10 @@ hooksPath = ~/.config/git/hooks [alias] l = log --all --oneline --graph --decorate -#[pull] +[pull] # rebase = true [merge] conflictstyle = zdiff3 + ff = only [diff] algorithm = histogram |