X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=74af916775cf00f4fd69bba4b493986a3fe96823;hb=469dfb554f9ee2f50c6df74372342abe8a229c0c;hp=5b16dad41d26b9f5a2681ac3542cf2e3a0ef091e;hpb=6c3765f8f9bf89a2fb297aae14e06114ab7d13b9;p=config%2Fdotfiles.git diff --git a/gitconfig.m4 b/gitconfig.m4 index 5b16dad..74af916 100644 --- a/gitconfig.m4 +++ b/gitconfig.m4 @@ -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 | less + tig = ! PWD/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