setup.sh: Drop unnecessary OS constant.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index 385166463fbae888093976962b2987521310a21b..3561376dbf69b69698c4ffecbf2dc6489d8b3434 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -42,8 +42,9 @@ include(../lib.m4)
 
 [core]
        editor = vim
-       # Can't use ~/ because of older git versions.
-       excludesfile = GITIGNORE
+       # Global gitattributes file. Thanks to canton7 in #git on Freenode
+       # (2011-11-09 13:23 CET).
+       attributesfile = PWD/gitattributes
 
 # Use pager for the following commands.
 [pager]
@@ -52,7 +53,8 @@ include(../lib.m4)
 
 [interactive]
        # Don't require <Return> in interactive commands which require only a
-       # single key, for example `git add --patch`.
+       # single key, for example `git add --patch`. Requires Perl module
+       # Term::Readkey.
        singlekey = yes
 
 [alias]
@@ -60,33 +62,30 @@ include(../lib.m4)
        #
        ## Local.
        c   = commit --verbose
-       ci  = commit --verbose
+       ca  = commit --verbose --amend
+       cad = commit --verbose --amend --date=
        d   = diff PATIENCE
-       di  = diff PATIENCE
        dw  = diff PATIENCE --color-words
        dc  = diff PATIENCE --cached
        dcw = diff PATIENCE --cached --color-words
+       ds  = diff --stat
        s   = status
-       st  = status
        l   = log
        ls  = log --stat
        lp  = log --patch PATIENCE
+       lpw = log --patch PATIENCE --color-words
        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 \
@@ -112,6 +111,7 @@ include(../lib.m4)
        sl  = stash list
        ss  = stash save
        ssk = stash save --keep-index
+       ssu = stash save --include-untracked
        sa  = stash apply
        sp  = stash pop
 
@@ -122,7 +122,31 @@ include(../lib.m4)
        # precise enough control over formats and colors.
        #
        # tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
-       tig = ! TIG | less
+       tig = ! PWD/bin/tig.pl
+
+       # Create backup of uncommitted and untracked changes.
+       ssb = "! git stash save --include-untracked \
+                    \"Backup on $(LANG=C date '+%a, %d %b %Y %H:%M:%S %z')\" \
+                    >/dev/null \
+             && git stash apply >/dev/null"
+
+       # Display list and content of untracked files. Untracked directories
+       # and symbolic links are only listed.
+       u = "! git ls-files --other --exclude-standard --directory -z \
+            | xargs -0 sh -c '\
+                  for x; do \
+                      printf \"\\033[1;33m-> %s\\033[0m:\" \"$x\"; \
+                      if test -d \"$x\"; then \
+                          echo \" directory\"; \
+                      elif test -h \"$x\"; then \
+                          echo \" symbolic link\"; \
+                      else \
+                          echo; \
+                          cat \"$x\"; \
+                      fi; \
+                      echo; \
+                  done' argv0 \
+            | less"
 
 [diff]
        # Detect copies and renames.
@@ -145,26 +169,21 @@ include(../lib.m4)
 [diff "gzip"]
        textconv = gzip -d -c
 [diff "pdf"]
-       textconv = pdftotext-
+       textconv = PWD/bin/pdftotext-
 [diff "sqlite"]
-       textconv = sqlite3dump
+       textconv = PWD/bin/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
 
-[receive]
+[transfer]
        # 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
+# vim: ft=gitconfig