X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=50d88a9191c495a5cddd5f3d645e929c3983a6e9;hb=e64f5aca9dff4e4a0cd8ced5d8131a06addb85ab;hp=846f013e56a8832e3e7d2d787c0ddf5850f4faa6;hpb=cd16f7b634107cfee3150314986040558690fa46;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index 846f013..50d88a9 100644
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -37,8 +37,8 @@
 	# Commit headers.
 	commit = cyan
 
-# GNU grep-like colors.
 [color "grep"]
+	# GNU grep-like colors.
 	filename = magenta
 	linenumber = green
 
@@ -48,16 +48,16 @@
 	# (2011-11-09 13:23 CET).
 	attributesfile = PWD/gitattributes
 
-# Use pager for the following commands.
 [pager]
-	status = yes
-	tag = yes
+	# Use pager for the following commands.
+	status = true
+	tag = true
 
 [interactive]
 	# Don't require <Return> in interactive commands which require only a
 	# single key, for example `git add --patch`. Requires Perl module
 	# Term::Readkey.
-	singlekey = yes
+	singlekey = true
 
 [alias]
 	## Shortcuts for often used commands.
@@ -79,6 +79,7 @@
 	ls  = log --stat
 	lp  = log --patch
 	lpw = log --patch --color-words
+	ld  = show --date=short -s --pretty='format:%h (\"%s\", %ad)' # describe
 	a   = add
 	ap  = add --patch
 	au  = add --update
@@ -173,6 +174,9 @@
 	# Diff algorithm to use.
 	algorithm = histogram
 
+	# Highlight moved code in a different color.
+	colorMoved = zebra
+
 	# Replace "a/" and "b/" prefix in diffs with characters describing the
 	# context (e.g. "i/"ndex and "w/"ork tree).
 	mnemonicprefix = true
@@ -202,13 +206,18 @@
 	# Display branches/tag names in log (same as log's --decorate option).
 	decorate = short
 	# If a single file is given to `git log`, automatically use --follow.
-	follow = yes
+	follow = true
 
 [merge]
 	tool = vimdiff
 
 	# Merge upstream branch if `git merge` is called without arguments.
-	defaultToUpstream = yes
+	defaultToUpstream = true
+
+[rebase]
+	# Use single-letter command names in git rebase -i which are faster to
+	# change.
+	abbreviateCommands = true
 
 [push]
 	# When running git push without a refspec push only the current
@@ -224,7 +233,11 @@
 [transfer]
 	# Automatically fsck objects when receiving them (respected by git
 	# receive-pack and git fetch (>= 1.7.8, for fetch)).
-	fsckObjects = yes
+	fsckObjects = true
+
+[advice]
+	# Disable annoying advice messages.
+	waitingForEditor = false
 
 
 # NON-GIT SETTINGS