diff options
| -rw-r--r-- | .gitconfig | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -11,8 +11,9 @@ d = diff dc = diff --cached s = status + st = status alias = "!bash -c '[ $# = 2 ] && git config --global alias.\"$1\" \"$2\" && exit 0 || echo \"usage: git alias <new alias> <original command>\" >&2 && exit 1' -" - ll = log --name-status --color -M -C + ll = log --name-status --decorate -M -C com = checkout master cleanse = clean -xfd spush = svn dcommit @@ -24,6 +25,8 @@ rename = copy [core] excludesfile = ~/.gitexcludes +[merge] + tool = vimdiff # colors :D [color] |