Hi Stefan
On 26/11/2018 21:20, Stefan Beller wrote:
On Fri, Nov 23, 2018 at 3:17 AM Phillip Wood <phillip.wood@xxxxxxxxxxxx> wrote:
From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx>
Thanks to Stefan for his feedback on v1. I've updated patches 2 & 8 in
response to those comments - see the range-diff below for details (the
patch numbers are off by one in the range diff, I think because the
first patch is unchanged and so it was used as the merge base by
--range-diff=<old-head>.
`git range-diff` accepts a three dotted "range" OLD...NEW
as an easy abbreviation for the arguments
"COMMON..OLD COMMON..NEW" and the common element is
computed as the last common element. It doesn't have knowledge
about where you started your topic branch.
I was using the new --range-diff option to format-patch, I think I
should have given --range-diff=@{u}..<old-head>.
For some reason the range-diff also includes
the notes even though I did not give --notes to format-patch)
This is interesting.
The existence of notes.rewrite.<command> seems to work well
with the range-diff then, as the config would trigger the copy-over
of notes and then range-diff would diff the original notes to the new
notes.
Yes, but I think with format-patch it should only diff the notes when
--notes is given.
When trying out the new --color-moved-ws=allow-indentation-change I
was disappointed to discover it did not work if the indentation
contains a mix of spaces and tabs. This series reworks it so that it
does.
The range-diff looks good to me.
That's good, thanks for your comments on the previous iterations.
Best Wishes
Phillip
Thanks,
Stefan
