Merge.
| author |
Steve Losh <steve@stevelosh.com> |
| date |
Tue, 15 Mar 2011 14:55:09 -0400 |
| parents |
1d88d4630cf7 |
| children |
47bf5a91934d |
[user]
name = Steve Losh
email = steve@stevelosh.com
[core]
pager = cat
editor = vim
[alias]
gl = log -10 --color=always --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n'
gll = log --color=always --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n'
pull = pull --ff-only
com = commit
cm = commit -m
co = checkout
stat = status
st = status
unstage = reset HEAD
uns = reset HEAD
[color]
branch = auto
diff = auto
interactive = auto
status = auto
[difftool "Kaleidoscope"]
cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[diff]
tool = Kaleidoscope