diff options
| author | Alex Scerba <alex@scerba.org> | 2024-10-29 10:35:11 -0400 |
|---|---|---|
| committer | Alex Scerba <alex@scerba.org> | 2024-10-29 10:35:11 -0400 |
| commit | 0e7c1f6213050bfe184dd25595518a1bba2c2368 (patch) | |
| tree | d7bb7d15d8e43adeedaa997d5bd353adbf74450e /.config/git | |
| parent | 07b79f2bacc53ca4f8deb7389797420d198a9e6c (diff) | |
Force merge to --ff-only
Diffstat (limited to '.config/git')
| -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 |