aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-30 01:21:11 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-30 01:21:11 +1200
commitc1af0cb935d383b5112a179f209bf66a0e388188 (patch)
treecdeccfffc12d70b86df1a1758b923e0ad9d09834
parentRemove most of git config; time to review it (diff)
downloaddotfiles-c1af0cb935d383b5112a179f209bf66a0e388188.tar.gz
dotfiles-c1af0cb935d383b5112a179f209bf66a0e388188.zip
Restore Git merge.log config to 1024 commits
-rw-r--r--git/gitconfig.mi51
1 files changed, 1 insertions, 0 deletions
diff --git a/git/gitconfig.mi5 b/git/gitconfig.mi5
index f1461179..02344e9a 100644
--- a/git/gitconfig.mi5
+++ b/git/gitconfig.mi5
@@ -3,6 +3,7 @@
[merge]
ff = false
+ log = 1024
[pull]
ff = only