X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=e7461fb3169c78a07c21532b7bbe49443dc0d614;hb=dce94516a4a5c18baa7f2102f95886a82a76936a;hp=1dd4f7b7b3a25f58bb7222b43a0c225582caabfc;hpb=8251bdb225ed90edb82ed444f55e8ae1fe50e6ac;p=config%2Fdotfiles.git

diff --git a/gitconfig.m4 b/gitconfig.m4
index 1dd4f7b..e7461fb 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -1,3 +1,24 @@
+# Global Git configuration file.
+
+# Copyright (C) 2011-2012  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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+
+
+dnl Load m4 macros.
+include(../lib.m4)
+
 [user]
 	name = Simon Ruderich
 	email = simon@ruderich.org
@@ -7,15 +28,85 @@
 
 [core]
 	editor = vim
-	excludesfile = HOME/.gitignore
+	# Can't use ~/ because of older git versions.
+	excludesfile = GITIGNORE
+
+# Use pager for the following commands.
+[pager]
+	status = yes
+	tag = yes
 
 [alias]
 	# Shortcuts for often used commands.
-	ci = commit -v
-	di = diff
+	#
+	# Local.
+	c  = commit --verbose
+	ci = commit --verbose
+	d  = diff --patience
+	di = diff --patience
+	dw = diff --patience --color-words
+	dc = diff --patience --cached
+	dcw = diff --patience --cached --color-words
+	s  = status
 	st = status
+	l  = log
+	ls = log --stat
+	lp = log --patch --patience
+	a  = add
+	ap = add --patch
+	au = add --update
+	# Branches.
 	co = checkout
-	br = branch
+	b  = branch --all --verbose
+	br = branch --all --verbose
+	m  = merge
 	me = merge
+	# Remote.
+	f  = fetch
+	fe = fetch
+	t  = tag
+	p  = push
+	pu = push
+	ru = remote update
+	# Patches.
+	fp = format-patch
+	# Misc.
+	fs = fsck --strict --full
+	ss = stash save
+	ssk = stash save --keep-index
+	sa = stash apply
+	sl = stash list
+
 	# Custom commands.
+	#
+	# tig-like log view.
 	glog = log --pretty=oneline --graph --all
+
+[diff]
+	# Detect copies and renames.
+	renames = copy
+
+# 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"]
+	textconv = gzip -d -c
+[diff "pdf"]
+	textconv = pdftotext-
+[diff "sqlite"]
+	textconv = sqlite3dump
+
+[merge]
+IF(OS, darwin)
+	tool = opendiff
+FI
+IF(OS, debian)
+	tool = vimdiff
+FI
+
+[format]
+	# When using git format-patch use threads and add all patches as
+	# replies to the first one.
+	thread = shallow
+
+# vim: ft=gitconfig