aboutsummaryrefslogtreecommitdiff
path: root/git/gitconfig.mi5
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-01-18 13:05:39 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-01-18 13:05:39 +1300
commite2ef4845869aa38823542034473b5d6ce6ba2f3d (patch)
treedea5af9adf4481baf40c592cd0ce9da665b32960 /git/gitconfig.mi5
parent99c655cd11cd9000a496bde9c9fced98308c6454 (diff)
parentb4ff392e2acfae87179bdd504f4b972f2ff3b371 (diff)
downloaddotfiles-e2ef4845869aa38823542034473b5d6ce6ba2f3d.tar.gz
dotfiles-e2ef4845869aa38823542034473b5d6ce6ba2f3d.zip
Merge branch 'release/v0.24.0'v0.24.0
* release/v0.24.0: Bump version number to 0.24.0 Always add --log to `git merge` Refactor directory creation in plugins Remove HTML and PHP syntax highlighting tweaks Clear unwanted syntax group, don't link to NONE
Diffstat (limited to 'git/gitconfig.mi5')
-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