diff options
| author | littleblack111 <littleblack11111@gmail.com> | 2025-10-13 22:56:18 +0800 |
|---|---|---|
| committer | littleblack111 <littleblack11111@gmail.com> | 2025-10-13 22:58:22 +0800 |
| commit | 542fa9ffaef0691a3a9f4ffef65f12e22c57d849 (patch) | |
| tree | e3f56a823778188e418eeec2642d5785d3ae3c0e /dot-gitconfig | |
| parent | 0c7001019bb345d59892de88c355b653d2680fdb (diff) | |
bump
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 |