X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=2f1ee7afce180aed06e31f5ce2839b5245cba1d9;hb=736772a24a226ea7be684d3eaf9006bcd77b7eea;hp=3325a3c1a4950a5090ece62a136deb17494f3b73;hpb=79fbdb30b001118daf1517cf2cbcb3f2870873b3;p=config%2Fdotfiles.git diff --git a/gitconfig.m4 b/gitconfig.m4 index 3325a3c..2f1ee7a 100644 --- a/gitconfig.m4 +++ b/gitconfig.m4 @@ -19,7 +19,7 @@ include(../lib.m4) # Use pager for the following commands. [pager] status = yes - clean = yes + tag = yes [alias] # Shortcuts for often used commands. @@ -27,11 +27,13 @@ include(../lib.m4) ci = commit -v d = diff di = diff + dc = diff --cached s = status st = status l = log ls = log --stat lp = log -p + glog = log --pretty=oneline --graph --all a = add ap = add -p co = checkout @@ -44,10 +46,8 @@ include(../lib.m4) t = tag p = push pu = push - # Custom commands. - fs = fsck --strict --full - glog = log --pretty=oneline --graph --all ru = remote update + fs = fsck --strict --full ss = stash save sa = stash apply sl = stash list @@ -56,6 +56,11 @@ include(../lib.m4) # Detect copies and renames. renames = copy +# Allow diffing of PDF files. `pdftotext-` is a wrapper around pdftotext which +# writes to stdout. +[diff "pdf"] + textconv = pdftotext- + [merge] IF(OS, darwin) tool = opendiff