X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=448000a3c431d301284206599c39b2ab2727c050;hb=95ec5924a6c2597f1b1a15aa9d6afcfe18bee222;hp=f97689006ea2155c96ee99dbc991ff78682a85b8;hpb=ef0b7066f4123c815ca67e74218613803c48506a;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index f976890..448000a 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
@@ -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
@@ -174,6 +177,9 @@
 [merge]
 	tool = vimdiff
 
+	# Merge upstream branch if `git merge` is called without arguments.
+	defaultToUpstream = yes
+
 [push]
 	# When running git push without a refspec push only the current
 	# branch, see man page git-config(1) for details.