gitconfig: Add aliases for commit --amend (ca, cad).

[config/dotfiles.git] / gitconfig.m4

diff --git a/gitconfig.m4 b/gitconfig.m4
index 263723c519c1e4029eefd3bf003f3302ad1c8cfb..801f9c6bacdc43ae575196aa02a6e8ecf0836b0d 100644 (file)
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -42,20 +42,25 @@ include(../lib.m4)
 
 [core]
        editor = vim
-       # Can't use ~/ because of older git versions.
-       excludesfile = GITIGNORE
 
 # Use pager for the following commands.
 [pager]
        status = yes
        tag = yes
 
+[interactive]
+       # Don't require <Return> in interactive commands which require only a
+       # single key, for example `git add --patch`.
+       singlekey = yes
+
 [alias]
        ## Shortcuts for often used commands.
        #
        ## 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
@@ -66,6 +71,7 @@ include(../lib.m4)
        l   = log
        ls  = log --stat
        lp  = log --patch PATIENCE
+       lpw = log --patch PATIENCE --color-words
        a   = add
        ap  = add --patch
        au  = add --update
@@ -117,7 +123,30 @@ include(../lib.m4)
        # precise enough control over formats and colors.
        #
        # tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
-       tig = ! TIG | less
+       tig = ! TIG
+
+       # Create backup of uncommitted and untracked changes.
+       ssb = "! git stash save --include-untracked \
+                               \"Backup on $(date -R)\" >/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.
@@ -157,7 +186,7 @@ FI
        # 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