josh/files
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update git Beyond Compare difftool from BC2 to BC3

Browse Source
This commit is contained in:
Josh Holtrop 2014-01-27 10:38:26 -05:00
parent 30349fc349
commit 66e4597b85
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bash_aliases
View File

@ -168,13 +168,13 @@ function git-config-joshs()
git config --global alias.mktarxz '!function f { name="$1"; pos="$2"; if [ "$pos" == "" ]; then pos=HEAD; fi; git archive --prefix="$name"/ "$pos" | xz > ../"$name".tar.xz; }; f' git config --global alias.mktarxz '!function f { name="$1"; pos="$2"; if [ "$pos" == "" ]; then pos=HEAD; fi; git archive --prefix="$name"/ "$pos" | xz > ../"$name".tar.xz; }; f'
git config --global push.default upstream git config --global push.default upstream
if [ -e /bin/cygwin1.dll ]; then if [ -e /bin/cygwin1.dll ]; then
git config --global alias.bcdiff 'difftool -y -t bc2' git config --global alias.bcdiff 'difftool -y -t bc3'
git config --global alias.bcdiffc 'difftool -y -t bc2 --cached' git config --global alias.bcdiffc 'difftool -y -t bc3 --cached'
git config --global difftool.bc2.cmd 'git_bc2diff "$LOCAL" "$REMOTE"' git config --global difftool.bc3.cmd 'git_bc3diff "$LOCAL" "$REMOTE"'
git config --global alias.bcmerge 'mergetool -y -t bc2' git config --global alias.bcmerge 'mergetool -y -t bc3'
git config --global mergetool.bc2.cmd \ git config --global mergetool.bc3.cmd \
'git_bc2merge "$LOCAL" "$REMOTE" "$MERGED"' 'git_bc3merge "$LOCAL" "$REMOTE" "$MERGED"'
git config --global mergetool.bc2.trustExitCode false git config --global mergetool.bc3.trustExitCode false
fi fi
} }
function git-config-local-personal() function git-config-local-personal()

5
git_bc3diff Executable file
View File

@ -0,0 +1,5 @@
#!/bin/sh
path1=$(cygpath -w "$1")
path2=$(cygpath -w "$2")
'/cygdrive/c/Program Files (x86)/Beyond Compare 3/BComp.exe' "$path1" "$path2" /title1=Base /leftreadonly

6
git_bc3merge Executable file
View File

@ -0,0 +1,6 @@
#!/bin/sh
local=$(cygpath -w "$1")
remote=$(cygpath -w "$2")
merged=$(cygpath -w "$3")
'/cygdrive/c/Program Files (x86)/Beyond Compare 3/BComp.exe' "$local" "$remote" /title1=Local /title2=Remote /savetarget="$merged"