setup.sh,gitconfig: Support old Git without diff --patience.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index ca21c56ec74a926d55249060571d9f5b4295f2da..7d8d6c4466b683e812feb87a77dbc4a91df5151c 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -1,5 +1,20 @@
 # 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)
@@ -11,46 +26,93 @@ include(../lib.m4)
 [color]
        ui = auto
 
+[color "diff"]
+       # Meta information.
+       meta = yellow bold
+       # Hunk header.
+       frag = magenta bold
+       # Function in hunk header.
+       function = magenta bold
+       # Removed lines.
+       old = red bold
+       # Added lines.
+       new = green bold
+       # Commit headers.
+       commit = cyan
+
 [core]
        editor = vim
+       # Can't use ~/ because of older git versions.
        excludesfile = GITIGNORE
 
 # Use pager for the following commands.
 [pager]
        status = yes
-       clean = yes
+       tag = yes
 
 [alias]
        # Shortcuts for often used commands.
-       c  = commit -v
-       ci = commit -v
-       d  = diff
-       di = diff
-       s  = status
-       st = status
-       l  = log
-       a  = add
-       co = checkout
-       b  = branch -av
-       br = branch -av
-       m  = merge
-       me = merge
-       f  = fetch
-       fe = fetch
-       t  = tag
-       p  = push
-       pu = push
+       #
+       # 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
+       b   = branch -a -v
+       br  = branch -a -v
+       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
+       sl  = stash list
+       ss  = stash save
+       sa  = stash apply
+       ssk = stash save --keep-index
+
        # Custom commands.
-       fs = fsck --strict --full
+       #
+       # tig-like log view.
        glog = log --pretty=oneline --graph --all
-       ss = stash save
-       sa = stash apply
-       sl = stash list
+       # Push to all remotes. Thanks to albel727 in #git on Freenode
+       # (2011-06-04 16:06 CEST) for the idea.
+       rp = ! git remote | xargs -L1 -I{} git push {}
 
 [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
@@ -59,4 +121,9 @@ 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