X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=2f1ee7afce180aed06e31f5ce2839b5245cba1d9;hb=736772a24a226ea7be684d3eaf9006bcd77b7eea;hp=970014fc564b5c63c7120282bc3cb51103a86fe4;hpb=690f07ca212e68f89a635b6d4a89a0d5ce479aaa;p=config%2Fdotfiles.git diff --git a/gitconfig.m4 b/gitconfig.m4 index 970014f..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,10 +27,15 @@ 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 b = branch -av br = branch -av @@ -41,9 +46,8 @@ include(../lib.m4) t = tag p = push pu = push - # Custom commands. + ru = remote update fs = fsck --strict --full - glog = log --pretty=oneline --graph --all ss = stash save sa = stash apply sl = stash list @@ -52,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