David Aguilar, 02.01.2009: > I now have a git-difftool wrapper script that basically just sets up > the environment for git-difftool-helper. git-difftool-helper does all > of the merge tool configuration stuff ala > http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html (it > uses the same git config variables and thus works with existing custom > commands). If you drop them both into the same directory it should > work as-is (it munges $PATH). > > It's not a two-liner (they do all that git config stuff and handle > more than just vimdiff) but it does use GIT_EXTERNAL_DIFF now, which > makes the script infinitely more useful. This is much nicer now since > you can pass any 'git diff' options to git-difftool and it'll handle > it correctly. > > The usage is simpler now too: > > usage: git difftool [--no-prompt] [--tool=tool] ["git diff" options] Now isn't this something for contrib, David? Markus -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
