X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=a701c250b2953f50c4c38e73800776ab843351d4;hb=818a192058faa7b69d1ec8d8b80bba3a7f57865d;hp=cb2b159b962996a4aea072db110c25af2cfabcc1;hpb=bece9f99788028738c8913b4405b2746a2d3ef72;p=config%2Fdotfiles.git diff --git a/gitconfig.in b/gitconfig.in index cb2b159..a701c25 100644 --- a/gitconfig.in +++ b/gitconfig.in @@ -29,7 +29,7 @@ # Hunk header. frag = magenta bold # Function in hunk header. - func = magenta bold + func = blue bold # Removed lines. old = red bold # Added lines. @@ -68,9 +68,10 @@ cad = commit --verbose --amend --date= d = diff dw = diff --color-words + ds = diff --stat dc = diff --cached dcw = diff --cached --color-words - ds = diff --stat + dcs = diff --cached --stat g = grep s = status l = log @@ -80,11 +81,20 @@ a = add ap = add --patch au = add --update + rs = reset + rsh = reset --hard + rsp = reset --patch + # Only clean ignored files. + cl = clean -ndx + clf = clean -fdx ## Branches. co = checkout b = branch -a -v m = merge mo = merge origin/master + re = rebase + rei = rebase --interactive + rec = rebase --continue ## Remote. f = fetch t = tag