# 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
dc = diff --cached
dcw = diff --cached --color-words
ds = diff --stat
+ g = grep
s = status
l = log
ls = log --stat
ss = stash save
ssk = stash save --keep-index
ssu = stash save --include-untracked
- sa = stash apply
- sp = stash pop
+ sa = stash apply --index
+ sp = stash pop --index
## Custom commands.
#
renames = copy
# Diff algorithm to use.
- algorithm = patience
+ algorithm = histogram
# Change the definition of a word as used by diff --color-words to be
# shorter (not only spaces) and thus simplify the generated diffs.
# changes to non-word characters are shown character wise (e.g. from
# "==" to "!=" as "[-=-]{+!+}="); [-..-] is removal, {+..+} is
# addition. See t/ for some tests and examples.
- wordregex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
+ wordRegex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
# Allow diffing of some binary files.
#
[diff "sqlite"]
textconv = sh -c 'exec sqlite3 "$@" .dump' -
+[log]
+ # Display branches/tag names in log (same as log's --decorate option).
+ decorate = short
+
[merge]
tool = vimdiff