Hey, On Tue, Jul 28, 2009 at 1:56 AM, David Aguilar<davvid@xxxxxxxxx> wrote: > > Good stuff, > Thanks Scott. > > In http://progit.org/book/ch7-1.html we go through a > lot of machinations to setup an external diff viewer. > > That might be a good time to introduce git-difftool, even if > only to mention that the setup is much simpler when difftool is > used. It allows you to do without the wrapper scripts. > > $ p4=/Applications/p4.merge.app/Contents/MacOS/p4merge > $ git config --global difftool.p4.cmd "$p4 \"\$LOCAL\" \"\$REMOTE\"" > $ git difftool -t p4 > > $ git config --global diff.tool p4 > $ git difftool > > It's even easier if you use one of the several built-in tools, > e.g. opendiff, kompare, meld, etc., since it requires no > configuration. That's a good point - I never actually covered that, it looks like. I'll put that in the list of things to cover for the second edition :) > > Mentioning that it's a fairly new feature is probably important, > too. Hmm. I guess I should've send a patch ;-) If you are interested in contributing and don't mind releasing the rights to your contributions to also be published commercially under a second edition in the future, please feel free to fork the project on GitHub and send me a pull request for anything you add. I've already gotten errata in this manner, which is pretty cool. Otherwise I'll try to get this in eventually. Thanks, Scott -- 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