X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gitconfig.in;h=bb835a4f2a7ecf42e60e7ab9fc8c05fef6c85815;hb=28aa3ac80bbb92a1e5ae5dd11859071137d71306;hp=6d84c262848035cd2f3a0ba64fc478a7b3d525ec;hpb=9f90a7aab903557fa811fdae87b059cca2e3d480;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index 6d84c26..bb835a4 100644
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -150,7 +150,7 @@
 	renames = copy
 
 	# Diff algorithm to use.
-	algorithm = patience
+	algorithm = histogram
 
 	# Change the definition of a word as used by diff --color-words to be
 	# shorter (not only spaces) and thus simplify the generated diffs.
@@ -174,6 +174,10 @@
 [diff "sqlite"]
 	textconv = sh -c 'exec sqlite3 "$@" .dump' -
 
+[log]
+	# Display branches/tag names in log (same as log's --decorate option).
+	decorate = short
+
 [merge]
 	tool = vimdiff