diff options
| author | Grégoire Duchêne <gduchene@awhk.org> | 2020-06-21 17:31:21 +0100 |
|---|---|---|
| committer | Grégoire Duchêne <gduchene@awhk.org> | 2020-06-21 17:31:21 +0100 |
| commit | 4bce8201c271a01132635ffcb13ebea09c616709 (patch) | |
| tree | 7a9c1c696b607153bfbc9c95f5ed981de638709a /git | |
| parent | 477a001b31a80b724c8ba69a62ff601f04d168df (diff) | |
git: Only allow fast-forward merges when pulling
Diffstat (limited to 'git')
| -rw-r--r-- | git/config | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -11,5 +11,8 @@ [diff] algorithm = histogram +[pull] + ff = only + [user] name = Grégoire Duchêne |