aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-01-18 13:01:45 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-01-18 13:01:45 +1300
commitef57ffcedae62fd65dfb1d9964e981f080057ec8 (patch)
treeadf462d229cdb3410162c9a99dc201e89463d03f
parentfead36ba0d10e88660955092026ccaedd2ea7f04 (diff)
parent5ff9286488eb3708d4ac646960fb8513d3c7a4e6 (diff)
downloaddotfiles-ef57ffcedae62fd65dfb1d9964e981f080057ec8.tar.gz
dotfiles-ef57ffcedae62fd65dfb1d9964e981f080057ec8.zip
Merge branch 'feature/git-merge' into develop
* feature/git-merge: Always add --log to `git merge`
-rw-r--r--git/gitconfig.mi51
1 files changed, 1 insertions, 0 deletions
diff --git a/git/gitconfig.mi5 b/git/gitconfig.mi5
index 5a50c13c..3c97a77d 100644
--- a/git/gitconfig.mi5
+++ b/git/gitconfig.mi5
@@ -40,6 +40,7 @@
[merge]
ff = false
+ log = true
[pager]
diff = cat