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

added BC2 git mergetool

Browse Source
This commit is contained in:
Josh Holtrop committed 2011-06-02 09:55:38 -04:00
1 parent 47635b2b60
commit 7fad671291
2 files changed
+15 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bash_aliases
+9 -3
View File
@@ -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