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

git config: support bcdiff/bcmerge from linux as well

Browse Source
This commit is contained in:
josh committed 2016-08-16 14:45:21 -04:00
1 parent e86ec078fb
commit 4bce7a84b6
3 files changed
+29 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bash_aliases
+7 -9
View File
@@ -182,15 +182,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.amd 'am --committer-date-is-author-date'
git config --global push.default upstream
if [ -e /bin/cygwin1.dll ]; then
git config --global alias.bcdiff 'difftool -y -t bc3'
git config --global alias.bcdiffc 'difftool -y -t bc3 --cached'
git config --global difftool.bc3.cmd 'git_bc3diff "$LOCAL" "$REMOTE"'
git config --global alias.bcmerge 'mergetool -y -t bc3'
git config --global mergetool.bc3.cmd \
'git_bc3merge "$LOCAL" "$REMOTE" "$MERGED"'
git config --global mergetool.bc3.trustExitCode false
fi
git config --global alias.bcdiff 'difftool -y -t bc3'
git config --global alias.bcdiffc 'difftool -y -t bc3 --cached'
git config --global difftool.bc3.cmd 'git_bc3diff "$LOCAL" "$REMOTE"'
git config --global alias.bcmerge 'mergetool -y -t bc3'
git config --global mergetool.bc3.cmd \
'git_bc3merge "$LOCAL" "$REMOTE" "$MERGED"'
git config --global mergetool.bc3.trustExitCode false
}
function git-config-local-personal()
{