diff options
Diffstat (limited to 'dot-gitconfig')
| -rw-r--r-- | dot-gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dot-gitconfig b/dot-gitconfig index 88e1be6b..86c0d5aa 100644 --- a/dot-gitconfig +++ b/dot-gitconfig @@ -31,3 +31,5 @@ autosquash = true [core] sshCommand = ssh -p 222 +[merge] + ff = false |