gitconfig: Add missing # in comment.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index 9748a00482db9d1831527aa625854b6384898178..0abd3a2b63fd6a29f529a8036b093cf952152c06 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -26,6 +26,20 @@ 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.
@@ -37,44 +51,86 @@ include(../lib.m4)
        tag = yes
 
 [alias]
-       # Shortcuts for often used commands.
-       c  = commit --verbose
-       ci = commit --verbose
-       d  = diff --patience
-       di = diff --patience
-       dc = diff --patience --cached
-       s  = status
-       st = status
-       l  = log
-       ls = log --stat
-       lp = log --patch --patience
-       glog = log --pretty=oneline --graph --all
-       a  = add
-       ap = add --patch
-       au = add --update
-       co = checkout
-       b  = branch --all --verbose
-       br = branch --all --verbose
-       m  = merge
-       me = merge
-       f  = fetch
-       fe = fetch
-       t  = tag
-       p  = push
-       pu = push
-       ru = remote update
-       fs = fsck --strict --full
-       ss = stash save
+       ## Shortcuts for often used commands.
+       #
+       ## 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
+       mo  = merge origin/master
+       ## Remote.
+       f   = fetch
+       fe  = fetch
+       t   = tag
+       p   = push
+       pu  = push
+       # Parallel git remote update. Also strips unnecessary output.
+       ru = "! git remote \
+             | xargs -d '\\n' -n1 -P0 git remote update 2>&1 \
+             | sed '/^$/d; \
+                    /^Please make sure you have the correct access rights$/d; \
+                    /^and the repository exists\\.$/d;'"
+       # Push to all remotes. Thanks to albel727 in #git on Freenode
+       # (2011-06-04 16:06 CEST) for the idea. Modified to push in parallel
+       # and to strip unnecessary output.
+       rp = "! git remote \
+             | xargs -d '\\n' -n1 -P0 git push 2>&1 \
+             | sed '/^$/d; \
+                    /^Please make sure you have the correct access rights$/d; \
+                    /^and the repository exists\\.$/d;'"
+       ## Patches.
+       fp  = format-patch
+       ## Maintenance.
+       # (Redirection of stderr is necessary to prevent missing output with
+       # my "color stderr" solution in Zsh.)
+       fs  = ! git fsck --strict --full 2>&1
+       fg  = ! git fs && git gc --aggressive 2>&1 # fsck and compress repo
+       ## Misc.
+       sl  = stash list
+       ss  = stash save
+       sa  = stash apply
+       sp  = stash pop
        ssk = stash save --keep-index
-       sa = stash apply
-       sl = stash list
-       fp = format-patch
+
+       ## Custom commands.
+       #
+       # tig-like log view.
+       tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
 
 [diff]
        # Detect copies and renames.
        renames = copy
 
+       # Change the definition of a word as used by diff --color-words to be
+       # shorter (not only spaces) and thus simplify the generated diffs.
+       # Words ([a-zA-Z0-9_]+) are matched, or a single non-word character
+       # ([^a-zA-Z0-9_]), therefore changes to words are shown in complete
+       # (e.g. from "word" to "newword" as "[-word-]{+newword+}"), but
+       # changes to non-word characters are shown character wise (e.g. from
+       # "==" to "!=" as "[-=-]{+!+}="); [-..-] is removal, {+..+} is
+       # addition. See t/ for some tests and examples.
+       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"]
@@ -97,4 +153,9 @@ FI
        # replies to the first one.
        thread = shallow
 
-# vim: ft=gitconfig
+[receive]
+       # Automatically fsck objects when receiving them (respected by git
+       # receive-pack and git fetch (>= 1.7.8, for fetch)).
+       fsckobjects = true
+
+# vim: ft=gitconfig noet