X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=f54be46c38c9ea7714b6cf37f65df5d46eeec535;hb=163f0ed89b7f01fd8dcff128b47df46648a77867;hp=d52b16a658491bae729bc9fe0d1133362e25b427;hpb=5963f2f7d075d45e21b5b4cfd203cab3263fd8d7;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index d52b16a..f54be46 100644
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -66,6 +66,7 @@
 	dc  = diff --cached
 	dcw = diff --cached --color-words
 	ds  = diff --stat
+	g   = grep
 	s   = status
 	l   = log
 	ls  = log --stat
@@ -109,8 +110,8 @@
 	ss  = stash save
 	ssk = stash save --keep-index
 	ssu = stash save --include-untracked
-	sa  = stash apply
-	sp  = stash pop
+	sa  = stash apply --index
+	sp  = stash pop --index
 
 	## Custom commands.
 	#
@@ -150,7 +151,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 +175,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