From cb91c9a82c53c12399fb11f7d186f51ecc1fb9ea Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Wed, 29 Jun 2016 12:04:21 +0200 Subject: misc Signed-off-by: Florian Pritz --- .gitconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.gitconfig') 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 -- cgit v1.2.3-24-g4f1b