diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2020-08-12 19:57:00 +0200 |
|---|---|---|
| committer | Tobias Klauser <tklauser@distanz.ch> | 2020-08-12 19:57:00 +0200 |
| commit | b66f4e808e60ef21285d429dfefb150cf20d2085 (patch) | |
| tree | a4c27b19be16c4e6d64caeb542e959fc62d018ff | |
| parent | c905c5cf674ef51f6c428a00c7481124230e6a40 (diff) | |
.gitconfig: set pull.ff=only
| -rw-r--r-- | .gitconfig | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -50,6 +50,9 @@ [push] default = matching +[pull] + ff = only + [merge] tool = vimdiff |