X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=11f725a0fcd8c0002f19e6d5c176e21316a4d44f;hb=f346dd2a6e436deac96312c5f87883c673bce348;hp=1f24fb838fa0b02438214e32b7f10ca722da2dc7;hpb=245fd7c2eb7a68c0094ec7a76b933cdd9f71c2ef;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index 1f24fb8..11f725a 100644
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -81,11 +81,21 @@
 	a   = add
 	ap  = add --patch
 	au  = add --update
+	rs  = reset
+	rsh = reset --hard
+	rsp = reset --patch
+	# Only clean ignored files.
+	cl  = clean -ndx
+	clf = clean -fdx
 	## Branches.
 	co  = checkout
 	b   = branch -a -v
+	br  = branch
 	m   = merge
 	mo  = merge origin/master
+	re  = rebase
+	rei = rebase --interactive
+	rec = rebase --continue
 	## Remote.
 	f   = fetch
 	t   = tag
@@ -193,7 +203,8 @@
 
 [push]
 	# When running git push without a refspec push only the current
-	# branch, see man page git-config(1) for details.
+	# branch, see man page git-config(1) for details. Default since Git
+	# 2.0.
 	default = simple
 
 [format]
@@ -204,6 +215,6 @@
 [transfer]
 	# Automatically fsck objects when receiving them (respected by git
 	# receive-pack and git fetch (>= 1.7.8, for fetch)).
-	fsckobjects = yes
+	fsckObjects = yes
 
 # vim: ft=gitconfig