X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.m4;h=1eb17f2541d56db264618d4626644db52d9585aa;hb=708517e604ba88d5f5786b20ad21536be6237651;hp=aaad40e0c415cb68644841f79888356c1d4997df;hpb=c3dfe4d4589b920310dbad76924cca4723df4456;p=config%2Fdotfiles.git diff --git a/gitconfig.m4 b/gitconfig.m4 index aaad40e..1eb17f2 100644 --- a/gitconfig.m4 +++ b/gitconfig.m4 @@ -15,15 +15,30 @@ include(../lib.m4) editor = vim excludesfile = GITIGNORE +# Use pager for the following commands. +[pager] + status = yes + clean = yes + [alias] # Shortcuts for often used commands. + c = commit -v ci = commit -v + d = diff di = diff + s = status st = status + l = log + a = add co = checkout - br = branch + b = branch -av + br = branch -av + m = merge me = merge + f = fetch fe = fetch + t = tag + p = push pu = push # Custom commands. fs = fsck --strict --full @@ -32,6 +47,10 @@ include(../lib.m4) sa = stash apply sl = stash list +[diff] + # Detect copies and renames. + renames = copy + [merge] IF(OS, darwin) tool = opendiff @@ -40,4 +59,9 @@ IF(OS, debian) tool = vimdiff FI +[format] + # When using git format-patch use threads and add all patches as + # replies to the first one. + thread = shallow + # vim: ft=gitconfig