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

Improve Beyond Compare integration with git

Browse Source
This commit is contained in:
josh committed 2021-03-26 15:28:18 -04:00
1 parent 5efd2ced47
commit c1a3af31f0
6 files changed
+30 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bash_aliases.d/git
+6 -7
View File
@@ -18,13 +18,12 @@ 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
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
git config --global alias.bcdiff 'difftool -y -t bc'
git config --global alias.bcdiffc 'difftool -y -t bc --cached'
git config --global difftool.bc.cmd 'git_bcdiff "$LOCAL" "$REMOTE" "$MERGED"'
git config --global alias.bcmerge 'mergetool -y -t bc'
git config --global mergetool.bc.cmd \
'git_bcmerge "$LOCAL" "$REMOTE" "$BASE" "$MERGED"'
git config --global alias.authors '!git log --pretty="%an" | sort | uniq -c | sort -n'
}
function git-config-local-personal()