aboutsummaryrefslogtreecommitdiffstats
path: root/git
diff options
context:
space:
mode:
Diffstat (limited to 'git')
-rw-r--r--git/.gitconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/git/.gitconfig b/git/.gitconfig
index 5063f77..35e0f16 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -7,9 +7,10 @@
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
excludesfile = ~/.gitignore
[pull]
- ff = only
-[fetch]
+ ff = only
+[push]
autoSetupRemote = true
+[fetch]
prune = true
[diff]
colorMoved = zebra