# Global Git configuration file.
-# Copyright (C) 2011-2014 Simon Ruderich
+# Copyright (C) 2011-2015 Simon Ruderich
#
# This file is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# Hunk header.
frag = magenta bold
# Function in hunk header.
- function = magenta bold
+ func = blue bold
# Removed lines.
old = red bold
# Added lines.
# Commit headers.
commit = cyan
+# GNU grep-like colors.
+[color "grep"]
+ filename = magenta
+ linenumber = green
+
[core]
editor = vim
# Global gitattributes file. Thanks to canton7 in #git on Freenode
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
ls = log --stat
a = add
ap = add --patch
au = add --update
+ rs = reset
+ rsh = reset --hard
+ rsp = reset --patch
## 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