setup.sh: No need to convert hgrc with m4 anymore.

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index ee62097e67d98262e41550ef9ec0165880e065ab..3561376dbf69b69698c4ffecbf2dc6489d8b3434 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -62,16 +62,14 @@ 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
@@ -82,16 +80,12 @@ include(../lib.m4)
        ## 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 \
@@ -117,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
 
@@ -131,7 +126,8 @@ include(../lib.m4)
 
        # Create backup of uncommitted and untracked changes.
        ssb = "! git stash save --include-untracked \
-                               \"Backup on $(date -R)\" >/dev/null \
+                    \"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
@@ -178,12 +174,7 @@ include(../lib.m4)
        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