X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=53dd50c671636edfca307d1dfddf87a65250c307;hb=ec25198061f9a6e1e9b57007a359201258112abe;hp=a6b1633ea00084c79422e257c569d32b9d14a837;hpb=918181cd69cc54bf0166b61529d16a02a4c5bd34;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index a6b1633..53dd50c 100644
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -68,10 +68,12 @@
 	cad = commit --verbose --amend --date=
 	d   = diff
 	dw  = diff --color-words
+	ds  = diff --stat
 	dc  = diff --cached
 	dcw = diff --cached --color-words
-	ds  = diff --stat
+	dcs = diff --cached --stat
 	g   = grep
+	gi  = grep --ignore-case
 	s   = status
 	l   = log
 	ls  = log --stat
@@ -80,11 +82,21 @@
 	a   = add
 	ap  = add --patch
 	au  = add --update
+	rs  = reset
+	rsh = reset --hard
+	rsp = reset --patch
+	rv  = revert
+	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
@@ -183,6 +195,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
@@ -192,7 +206,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]
@@ -203,6 +218,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