diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-01-18 13:01:31 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-01-18 13:01:31 +1300 |
commit | 5ff9286488eb3708d4ac646960fb8513d3c7a4e6 (patch) | |
tree | adf462d229cdb3410162c9a99dc201e89463d03f /git/gitconfig.mi5 | |
parent | Merge branch 'feature/vim-after-s...' into develop (diff) | |
download | dotfiles-5ff9286488eb3708d4ac646960fb8513d3c7a4e6.tar.gz dotfiles-5ff9286488eb3708d4ac646960fb8513d3c7a4e6.zip |
Always add --log to `git merge`
Diffstat (limited to 'git/gitconfig.mi5')
-rw-r--r-- | git/gitconfig.mi5 | 1 |
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 |