diff options
| author | René Neumann <rene.neumann@in.tum.de> | 2012-10-01 17:13:52 +0200 |
|---|---|---|
| committer | René Neumann <rene.neumann@in.tum.de> | 2012-10-01 17:13:52 +0200 |
| commit | 2fd164ea77b6153b096a135db8f493be8e5f4573 (patch) | |
| tree | 6b73f53a1729ab4a21fc766da824b5cc3b506d9a /.gitconfig | |
| parent | 2ee0f3a1b82eb28fc0923f2a0d89daae967bddca (diff) | |
| download | dotfiles-2fd164ea77b6153b096a135db8f493be8e5f4573.tar.gz dotfiles-2fd164ea77b6153b096a135db8f493be8e5f4573.tar.bz2 dotfiles-2fd164ea77b6153b096a135db8f493be8e5f4573.zip | |
More git changes
Diffstat (limited to '.gitconfig')
| -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] |