On Mon, Jun 10, 2013 at 12:28:55PM -0700, Junio C Hamano wrote: > John Keeping <john@xxxxxxxxxxxxx> writes: > > > I think the first thing to do is read the "diff.algorithm" setting in > > git-add--interactive and pass its value to the underlying diff-index and > > diff-files commands, but should we also have a command line parameter to > > git-add to specify the diff algorithm in interactive mode? And if so, > > can we simply add "--diff-algorithm" to git-add, or is that too > > confusing? > > Making "git add--interactive" read from diff.algorithm is probably a > good idea, because the command itself definitely is a Porcelain. We > would probably need a way to defeat the configured default for > completeness, either: > > git add -p --diff-algorithm=default > git -c diff.algorithm=default add -p > > but I suspect that a new option to "git add" that only takes effect > together with "-p" is probably an overkill, only in order to support > the former and not having to say the latter, but I can be persuaded > either way. Worse than that, you would need to add such an option to "checkout -p", "reset -p", "stash -p", etc. I think the latter form you suggest is probably acceptable in this case. Overall, I think respecting diff.algorithm in add--interactive is a very sane thing to do. I would even be tempted to say we should allow a few other select diff options (e.g., fewer or more context lines). If you allowed diff options like this: git add --patch="--patience -U5" that is very flexible, but I would not want to think about what the code does when you pass --patch="--raw" or equal nonsense. But I cannot off the top of my head think of other options besides -U that would be helpful. I have never particularly wanted it for "add -p", either, though I sometimes generate patches to the list with a greater number of context lines when I think it makes the changes to a short function more readable. -Peff -- 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