diff options
| author | Alex Scerba <alex@scerba.org> | 2024-10-29 10:43:55 -0400 |
|---|---|---|
| committer | Alex Scerba <alex@scerba.org> | 2024-10-29 10:43:55 -0400 |
| commit | e2fe2f27d4a0b96643cd706ac81b1f14dae1830c (patch) | |
| tree | 340e2aebba373b9ee0a21cfdc2f303e706aaaf9c /.config | |
| parent | 0e7c1f6213050bfe184dd25595518a1bba2c2368 (diff) | |
Force pull to --ff-only
Diffstat (limited to '.config')
| -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 |