Re: [PATCH] git-add--interactive.perl: Permit word-based diff

2013-06-18 Thread Jeff King
On Sat, Jun 15, 2013 at 04:01:04PM +0200, Mark Abraham wrote: Controlled by new configuration option color.word-diff-in-interactive-add. There is no existing support for git add to pass a command-line option like --word-diff=color to git-add--interactive.perl, so a configuration option is the

Re: [PATCH] git-add--interactive.perl: Permit word-based diff

2013-06-18 Thread Thomas Rast
[I don't seem to have received a copy of the original mail, so I can only guess...] Jeff King p...@peff.net writes: On Sat, Jun 15, 2013 at 04:01:04PM +0200, Mark Abraham wrote: Controlled by new configuration option color.word-diff-in-interactive-add. There is no existing support for git

Re: [PATCH] git-add--interactive.perl: Permit word-based diff

2013-06-18 Thread Jeff King
On Tue, Jun 18, 2013 at 09:22:16AM +0200, Thomas Rast wrote: [I don't seem to have received a copy of the original mail, so I can only guess...] Yes, the original doesn't seem to have made it to the list. Sorry, I don't have a copy (I am in the habit of deleting direct mails that are cc'd to

Re: [PATCH] git-add--interactive.perl: Permit word-based diff

2013-06-18 Thread Mark Abraham
On Tue, Jun 18, 2013 at 7:23 PM, Jeff King p...@peff.net wrote: On Tue, Jun 18, 2013 at 09:22:16AM +0200, Thomas Rast wrote: [I don't seem to have received a copy of the original mail, so I can only guess...] Yes, the original doesn't seem to have made it to the list. Sorry, I don't have a

Re: [PATCH] git-add--interactive.perl: Permit word-based diff

2013-06-18 Thread Jeff King
On Tue, Jun 18, 2013 at 11:12:59PM +0200, Mark Abraham wrote: In general, I think one can assume 1-to-1 correspondence between whole regular diffs and whole word-diffs, but not below that (i.e., neither a correspondence between hunks nor between lines). [...] My choice of permit in the