X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=1977f2e67955ff47e85d4a29e2ac8b6ee353b383;hb=d7f7f59419c69580f22d7b74eb5d399412ad5483;hp=0abd3a2b63fd6a29f529a8036b093cf952152c06;hpb=ca2c08f78a676fa1e0e701312953566e87f76221;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index 0abd3a2..1977f2e 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -1,6 +1,6 @@
 # Global Git configuration file.
 
-# Copyright (C) 2011-2012  Simon Ruderich
+# Copyright (C) 2011-2013  Simon Ruderich
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -42,14 +42,17 @@ include(../lib.m4)
 
 [core]
 	editor = vim
-	# Can't use ~/ because of older git versions.
-	excludesfile = GITIGNORE
 
 # Use pager for the following commands.
 [pager]
 	status = yes
 	tag = yes
 
+[interactive]
+	# Don't require <Return> in interactive commands which require only a
+	# single key, for example `git add --patch`.
+	singlekey = yes
+
 [alias]
 	## Shortcuts for often used commands.
 	#
@@ -106,14 +109,23 @@ include(../lib.m4)
 	## Misc.
 	sl  = stash list
 	ss  = stash save
+	ssk = stash save --keep-index
 	sa  = stash apply
 	sp  = stash pop
-	ssk = stash save --keep-index
 
 	## Custom commands.
 	#
-	# tig-like log view.
-	tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
+	# tig-like log view. Similar to the following but with author/date
+	# information. --pretty=format is not used because it doesn't allow
+	# precise enough control over formats and colors.
+	#
+	# tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
+	tig = ! TIG
+
+	# Create backup of uncommitted and untracked changes.
+	ssb = "! git stash save --include-untracked \
+	                        \"Backup on $(date -R)\" >/dev/null \
+	      && git stash apply >/dev/null"
 
 [diff]
 	# Detect copies and renames.
@@ -153,7 +165,7 @@ FI
 	# replies to the first one.
 	thread = shallow
 
-[receive]
+[transfer]
 	# Automatically fsck objects when receiving them (respected by git
 	# receive-pack and git fetch (>= 1.7.8, for fetch)).
 	fsckobjects = true