# HG changeset patch # User Steve Losh # Date 1278909145 14400 # Node ID 77915b6f0ed84b6c8451b232ff84ea3ae7f9e890 # Parent 6bd31aa2672a62d000a2a7c500d423868733e434 git: fix gl and gll aliases diff -r 6bd31aa2672a -r 77915b6f0ed8 .gitconfig --- a/.gitconfig Sun Jul 11 01:35:46 2010 -0400 +++ b/.gitconfig Mon Jul 12 00:32:25 2010 -0400 @@ -7,8 +7,8 @@ editor = vim [alias] -gl = log -10 --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n' -gll = log --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n' +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' com = commit cm = commit -m @@ -26,9 +26,12 @@ diff = auto interactive = auto status = auto + [difftool "Kaleidoscope"] - cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\" +cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\" + [difftool] - prompt = false +prompt = false + [diff] - tool = Kaleidoscope +tool = Kaleidoscope