diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2016-08-10 11:34:29 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2016-08-10 11:34:29 +1200 |
commit | e1fe4815e06d00fecff784b2c9bf4538980afa87 (patch) | |
tree | 00a98f55101d615a22f84e3355c8b7c1fa60d62e /git/gitconfig.m4 | |
parent | Merge branch 'freebsd' (diff) | |
download | dotfiles-e1fe4815e06d00fecff784b2c9bf4538980afa87.tar.gz dotfiles-e1fe4815e06d00fecff784b2c9bf4538980afa87.zip |
Don't fast-forward my merges
<http://stackoverflow.com/a/6810687>
I'll rebase if I do want this.
Diffstat (limited to 'git/gitconfig.m4')
-rw-r--r-- | git/gitconfig.m4 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git/gitconfig.m4 b/git/gitconfig.m4 index ea6b1220..060740a2 100644 --- a/git/gitconfig.m4 +++ b/git/gitconfig.m4 @@ -21,6 +21,9 @@ date = local decorate = short +[merge] + ff = false + [push] default = matching |