diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/essentials/git/config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/essentials/git/config b/config/essentials/git/config index 5d269ec..66ed53e 100644 --- a/config/essentials/git/config +++ b/config/essentials/git/config @@ -5,3 +5,5 @@ name = Raymaekers Luca [pull] rebase = false +[merge] + ff = false |