X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=2b9889ec70fe87d3d686bc1e6dea238612257db4;hb=068c25e04d8a748353e4bfd32f949056abe4659b;hp=1eb17f2541d56db264618d4626644db52d9585aa;hpb=708517e604ba88d5f5786b20ad21536be6237651;p=config%2Fdotfiles.git diff --git a/gitconfig.m4 b/gitconfig.m4 index 1eb17f2..2b9889e 100644 --- a/gitconfig.m4 +++ b/gitconfig.m4 @@ -13,12 +13,14 @@ 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 clean = yes + tag = yes [alias] # Shortcuts for often used commands. @@ -26,10 +28,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 @@ -40,9 +47,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 @@ -51,6 +57,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