diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2023-03-06 20:22:55 +0100 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2023-03-06 20:22:55 +0100 |
| commit | 390f2e5db7c5cb332226697931375e0e3708f2ee (patch) | |
| tree | b2960aa2748a7eb83870df01fa0af7a6b571d730 /config | |
| parent | 74f99fdc52d797a85b3cdab351dd6f607e08bb6d (diff) | |
| download | dotfiles-390f2e5db7c5cb332226697931375e0e3708f2ee.tar.gz dotfiles-390f2e5db7c5cb332226697931375e0e3708f2ee.tar.bz2 dotfiles-390f2e5db7c5cb332226697931375e0e3708f2ee.zip | |
Added git config fast forward merge
Diffstat (limited to 'config')
| -rw-r--r-- | config/git/config.linux | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/git/config.linux b/config/git/config.linux index 2aa5963..f9bbcab 100644 --- a/config/git/config.linux +++ b/config/git/config.linux @@ -9,6 +9,7 @@ [merge] tool = vimdiff conflictstyle = diff3 + ff = true [mergetool] keepBackup = false prompt = false |