Created
April 14, 2011 11:13
-
-
Save dreamiurg/919278 to your computer and use it in GitHub Desktop.
git configuration with BeyondCompare as difftool/mergetool and pretty log
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[alias] | |
st = status | |
co = checkout | |
ci = commit | |
br = branch | |
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)%an%Creset' --abbrev-commit --date=relative | |
[color] | |
ui = auto | |
[color "branch"] | |
current = yellow reverse | |
local = yellow | |
remote = green | |
[color "diff"] | |
meta = yellow bold | |
frag = magenta bold | |
old = red bold | |
new = green bold | |
[color "status"] | |
added = yellow | |
changed = green | |
untracked = cyan | |
[diff] | |
tool = bc3 | |
[difftool] | |
prompt = false | |
[difftool "bc3"] | |
#use cygpath to transform cygwin path $LOCAL (something like /tmp/U5VvP1_abc) to windows path, because bc3 is a windows software | |
cmd = \"c:/program files/beyond compare 3/bcomp.exe\" "$(cygpath -w $LOCAL)" "$(cygpath -w $REMOTE)" | |
[merge] | |
tool = bc3 | |
[mergetool] | |
prompt = false | |
[mergetool "bc3"] | |
#trustExitCode = true | |
cmd = \"c:/program files/beyond compare 3/bcomp.exe\" "$(cygpath -w $LOCAL)" "$(cygpath -w $REMOTE)" "$BASE" "$MERGED" "$MERGED" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment