X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=b6292ad21d6ef7182892238d57d5287774482f1c;hb=3d1b8f3b2ea96c7779bb2582f71bf5fbac236373;hp=0f2d4d0fcc11df4ed849626668cd2d770035f929;hpb=91be5d6a9ab86f14eed55a4fc0f6b8928900c21c;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index 0f2d4d0..b6292ad 100644
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -61,16 +61,16 @@
 	c   = commit --verbose
 	ca  = commit --verbose --amend
 	cad = commit --verbose --amend --date=
-	d   = diff --patience
-	dw  = diff --patience --color-words
-	dc  = diff --patience --cached
-	dcw = diff --patience --cached --color-words
+	d   = diff
+	dw  = diff --color-words
+	dc  = diff --cached
+	dcw = diff --cached --color-words
 	ds  = diff --stat
 	s   = status
 	l   = log
 	ls  = log --stat
-	lp  = log --patch --patience
-	lpw = log --patch --patience --color-words
+	lp  = log --patch
+	lpw = log --patch --color-words
 	a   = add
 	ap  = add --patch
 	au  = add --update
@@ -109,8 +109,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.
 	#
@@ -149,6 +149,9 @@
 	# Detect copies and renames.
 	renames = copy
 
+	# Diff algorithm to use.
+	algorithm = patience
+
 	# Change the definition of a word as used by diff --color-words to be
 	# shorter (not only spaces) and thus simplify the generated diffs.
 	# Words ([a-zA-Z0-9_]+) are matched, or a single non-word character
@@ -157,7 +160,7 @@
 	# changes to non-word characters are shown character wise (e.g. from
 	# "==" to "!=" as "[-=-]{+!+}="); [-..-] is removal, {+..+} is
 	# addition. See t/ for some tests and examples.
-	wordregex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
+	wordRegex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
 
 # Allow diffing of some binary files.
 #
@@ -171,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