X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=66c73761245e5a4aad1706b131a88be64ab74382;hb=bfd5d27338963d359e144db67e58cb69b0bb5496;hp=f1e66720147dad0f94bc8d1ddb11e2a474f27b6a;hpb=f5d4f662fdff8ff95bd813469bbc577bfbdd0eeb;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index f1e6672..66c7376 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,18 @@ 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
+	# 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 | less
 
 [diff]
 	# Detect copies and renames.
@@ -130,6 +137,7 @@ include(../lib.m4)
 	wordregex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
 
 # Allow diffing of some binary files.
+#
 # `pdftotext-` is a wrapper around pdftotext which writes to stdout.
 # `sqlite3dump` is a wrapper calling `sqlite3 database-file .dump`.
 [diff "gzip"]
@@ -152,7 +160,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