Junio C Hamano venit, vidit, dixit 03.06.2010 01:38: > Sylvain Rabot <srabot@xxxxxxxxx> writes: > >> +Be aware that 'git mergetool' has some predefined invocation commands builtin >> +for known diff tools like meld, diffuse, p4merge ... etc. It means that if >> +you set the merge.tool configuration to one of these tools, the >> +mergetool.<tool>.* configurations will not be taken care of. If you >> +really want to customize the invocation of one of these tools, >> +set `merge.tool` to "custom" or whatever you want and `mergetool.custom.cmd` >> +to "/usr/bin/<tool> $LOCAL $MERGED $REMOTE" > > Two half-points and three points (that makes them four in total ;-): > > o If I read the above without "It means that", it still makes sense; > > o "If you really" can go without "really"; > > * I had to read "will not be taken care of" twice; "are ignored" is > probably easier to understand; > > * The description and the example makes it sound as if the command line > has to have these three tokens in the given order, but the whole point > of this mechanism is that you can launch whatever external command with > a custom command line, so "and `mergetool.custom.cmd` to a command line > to invoke the command. $LOCAL $MERGED and $REMOTE on this command line > are substituted by ...." may be more reader-friendly. > > * As a documentation update it is perfectly fine to describe this glitch, > but I wonder if we might want to lift this restriction (read: consider > this as a bug and fix it). Definitely. The current behaviour even means that when you have set up fancytool, and then a new git-mergetool version suddenly starts to support fancytool, possibly with different options, your existing configuration breaks. I.e., even for currently unsupported tools you have to use the procedure Silvain describes in order to protect against updates! Michael -- 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