gitconfig: Use long options in aliases.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index 0bf7b0037f3912de7a398d3cf4e6d8edb831457a..9748a00482db9d1831527aa625854b6384898178 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)
@@ -23,8 +38,8 @@ include(../lib.m4)
 
 [alias]
        # Shortcuts for often used commands.
-       c  = commit -v
-       ci = commit -v
+       c  = commit --verbose
+       ci = commit --verbose
        d  = diff --patience
        di = diff --patience
        dc = diff --patience --cached
@@ -32,14 +47,14 @@ include(../lib.m4)
        st = status
        l  = log
        ls = log --stat
-       lp = log -p --patience
+       lp = log --patch --patience
        glog = log --pretty=oneline --graph --all
        a  = add
-       ap = add -p
-       au = add -u
+       ap = add --patch
+       au = add --update
        co = checkout
-       b  = branch -av
-       br = branch -av
+       b  = branch --all --verbose
+       br = branch --all --verbose
        m  = merge
        me = merge
        f  = fetch
@@ -59,9 +74,11 @@ include(../lib.m4)
        # Detect copies and renames.
        renames = copy
 
-# Allow diffing of PDF files. `pdftotext-` is a wrapper around pdftotext which
-# writes to stdout. `sqlite3dump` is a wrapper calling `sqlite3 database-file
-# .dump`.
+# 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"]