From 7fad671291b70ba8ef8318e04a467010938c63ed Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Thu, 2 Jun 2011 09:55:38 -0400 Subject: [PATCH] added BC2 git mergetool --- bash_aliases | 12 +++++++++--- git_bc2merge | 6 ++++++ 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100755 git_bc2merge diff --git a/bash_aliases b/bash_aliases index 4f5369b..4e07d82 100755 --- a/bash_aliases +++ b/bash_aliases @@ -92,9 +92,15 @@ function git-config-joshs() git config --global alias.dc 'diff --cached' git config --global alias.gdiff 'difftool -y -t gvimdiff' git config --global alias.gdiffc 'difftool -y -t gvimdiff --cached' - git config --global alias.bcdiff 'difftool -y -t bc2' - git config --global alias.bcdiffc 'difftool -y -t bc2 --cached' - git config --global difftool.bc2.cmd 'git_bc2diff "$LOCAL" "$REMOTE"' + if [ -e /bin/cygwin1.dll ]; then + git config --global alias.bcdiff 'difftool -y -t bc2' + git config --global alias.bcdiffc 'difftool -y -t bc2 --cached' + git config --global difftool.bc2.cmd 'git_bc2diff "$LOCAL" "$REMOTE"' + git config --global alias.bcmerge 'mergetool -y -t bc2' + git config --global mergetool.bc2.cmd \ + 'git_bc2merge "$LOCAL" "$REMOTE" "$MERGED"' + git config --global mergetool.bc2.trustExitCode false + fi } alias git-find-lost-commit='git fsck --lost-found' if [[ "$(which jsvn 2>/dev/null)" != "" ]]; then diff --git a/git_bc2merge b/git_bc2merge new file mode 100755 index 0000000..6d17f2b --- /dev/null +++ b/git_bc2merge @@ -0,0 +1,6 @@ +#!/bin/sh + +local=$(cygpath -w "$1") +remote=$(cygpath -w "$2") +merged=$(cygpath -w "$3") +/cygdrive/c/apps/Beyond\ Compare\ 2/BC2.exe "$local" "$remote" /title1=Local /title2=Remote /savetarget="$merged"