summaryrefslogtreecommitdiffstats
path: root/.gitconfig
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2016-06-29 12:04:21 +0200
committerFlorian Pritz <bluewind@xinu.at>2016-06-29 12:04:21 +0200
commitcb91c9a82c53c12399fb11f7d186f51ecc1fb9ea (patch)
tree7dc21e14f3d80f61fa776b59f0d7947048d806c6 /.gitconfig
parentfa83b9f4c293dab8e8c5923cb1d6afe61b3a6ad1 (diff)
downloaddotfiles-cb91c9a82c53c12399fb11f7d186f51ecc1fb9ea.tar.gz
dotfiles-cb91c9a82c53c12399fb11f7d186f51ecc1fb9ea.tar.xz
misc
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitconfig b/.gitconfig
index 22b054f..6e2b555 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -24,7 +24,7 @@
p = push --follow-tags
dw = diff --color-words
[merge]
- tool = vimdiff
+ tool = kdiff3
conflictstyle = diff3
[push]
default = current
@@ -59,3 +59,5 @@
show = /usr/share/git/diff-highlight/diff-highlight | less
[grep]
lineNumber = true
+[tag]
+ sort = version:refname