To follow-up on Charles Bailey's answer, here's my git setup that's using p4merge (free cross-platform 3way merge tool); tested on msys Git (Windows) install: git config --global merge.tool p4merge git config --global mergetool.p4merge.cmd 'p4merge.exe \"$BASE\" \"$LOCAL\" \"...
git-log(1) git-lost-found(1) git-ls-files(1) git-ls-remote(1) git-ls-tree(1) git-mailinfo(1) git-mailsplit(1) git-merge-base(1) git-merge-file(1) git-merge-index(1) git-merge-one-file(1) git-merge-tree(1) git-merge(1) git-mergetool--lib(1) git-mergetool(1) git-...
If $XDG_CONFIG_HOME is not set or empty, $HOME/.config/git/config will be used. Any single-valued variable set in this file will be overwritten by whatever is in ~/.gitconfig. It is a good idea not to create this file if you sometimes use older versions of Git, as support for ...
The process of configuring Git to useDiffMergeon Mac OS is perhaps the most straightforward. Make sure you have the directory below. /usr/local/bin/diffmerge Run the commands below to update your.gitconfigfile and test it out. gitconfig --global merge.tool diffmergegitconfig --global mergeto...
Uses git diff --no-index for --diff-cmd by default, as it is very fast, has nice colors and should be widely available.Started as a cfgit project long time ago, evolved away into this more generic (and not necessarily git-related) tool....
git-log(1) git-lost-found(1) git-ls-files(1) git-ls-remote(1) git-ls-tree(1) git-mailinfo(1) git-mailsplit(1) git-merge-base(1) git-merge-file(1) git-merge-index(1) git-merge-one-file(1) git-merge-tree(1) git-merge(1) git-mergetool--lib(1) git-mergetool(1) git-...
git-lost-found(1) git-ls-files(1) git-ls-remote(1) git-ls-tree(1) git-mailinfo(1) git-mailsplit(1) git-merge-base(1) git-merge-file(1) git-merge-index(1) git-merge-one-file(1) git-merge-tree(1) git-merge(1) git-mergetool--lib(1) git-mergetool(1) git-mktag(1) git...
git-init(1) git-instaweb(1) git-log(1) git-lost-found(1) git-ls-files(1) git-ls-remote(1) git-ls-tree(1) git-mailinfo(1) git-mailsplit(1) git-merge-base(1) git-merge-file(1) git-merge-index(1) git-merge-one-file(1) git-merge-tree(1) git-merge(1) git-mergetool--...
git-init(1) git-instaweb(1) git-log(1) git-lost-found(1) git-ls-files(1) git-ls-remote(1) git-ls-tree(1) git-mailinfo(1) git-mailsplit(1) git-merge-base(1) git-merge-file(1) git-merge-index(1) git-merge-one-file(1) git-merge-tree(1) git-merge(1) git-mergetool--...
git-init(1) git-instaweb(1) git-log(1) git-lost-found(1) git-ls-files(1) git-ls-remote(1) git-ls-tree(1) git-mailinfo(1) git-mailsplit(1) git-merge-base(1) git-merge-file(1) git-merge-index(1) git-merge-one-file(1) git-merge-tree(1) git-merge(1) git-mergetool--...