diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2016-08-17 17:01:27 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2016-08-17 17:01:27 +1200 |
commit | 599522f087dfd0679313996adb5adc97b551d70c (patch) | |
tree | 46dd2b6472b60ff61f08489edd42229405050fbd /git | |
parent | Be explicit about check/man passing (diff) | |
download | dotfiles-599522f087dfd0679313996adb5adc97b551d70c.tar.gz dotfiles-599522f087dfd0679313996adb5adc97b551d70c.zip |
Only pull if rebase possible
Force me to fetch and merge properly otherwise
Diffstat (limited to 'git')
-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 dfe46157..73bdae98 100644 --- a/git/gitconfig.m4 +++ b/git/gitconfig.m4 @@ -26,6 +26,9 @@ [merge] ff = false +[pull] + ff = only + [push] default = current |