]> ruderich.org/simon Gitweb - config/dotfiles.git/blobdiff - gitconfig.m4
bin: Add pdftotext- and sqlite3dump.
[config/dotfiles.git] / gitconfig.m4
index 1977f2e67955ff47e85d4a29e2ac8b6ee353b383..e361a07dfdd8daa5e21f543b6f407c785ec056b9 100644 (file)
@@ -59,6 +59,8 @@ 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
@@ -69,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
@@ -120,13 +123,31 @@ include(../lib.m4)
        # precise enough control over formats and colors.
        #
        # tig = log --pretty=oneline --graph --all --decorate --abbrev-commit
-       tig = ! TIG
+       tig = ! PWD/bin/tig.pl
 
        # 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.
        renames = copy
@@ -148,9 +169,9 @@ 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)