X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=5058769b9359865118fbd8944aa94d1b2625db39;hb=91f65e03287bdae9ad01acb97670517cba230b34;hp=f6d7f241e05cca04eba5c3a5dba2b4557ac6bccb;hpb=d04bd441a030e4e23c7a3e6d954a70e051bb28ec;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index f6d7f24..5058769 100644
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -85,7 +85,7 @@
 	rs  = reset
 	rsh = reset --hard
 	rsp = reset --patch
-	# Only clean ignored files.
+	rv  = revert
 	cl  = clean -ndx
 	clf = clean -fdx
 	## Branches.
@@ -97,6 +97,9 @@
 	re  = rebase
 	rei = rebase --interactive
 	rec = rebase --continue
+	cp  = cherry-pick
+	## Submodules.
+	sm  = submodule
 	## Remote.
 	f   = fetch
 	t   = tag
@@ -170,6 +173,10 @@
 	# Diff algorithm to use.
 	algorithm = histogram
 
+	# Replace "a/" and "b/" prefix in diffs with characters describing the
+	# context (e.g. "i/"ndex and "w/"ork tree).
+	mnemonicprefix = true
+
 	# 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
@@ -195,6 +202,8 @@
 [log]
 	# 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
 
 [merge]
 	tool = vimdiff
@@ -218,4 +227,11 @@
 	# receive-pack and git fetch (>= 1.7.8, for fetch)).
 	fsckObjects = yes
 
+
+# NON-GIT SETTINGS
+
+[annex]
+	# My SSH config already uses ControlMaster where appropriate.
+	sshcaching = false
+
 # vim: ft=gitconfig