From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Mar 2012 16:36:15 GMT
Subject: Re: [PATCH 0/9 v2] difftool: teach command to perform directory diffs
Message-ID: <7vmx7b6xhc.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAFouetj2gME+X47EUAQTUKX_GJ8PW=cSWRj7VUdBsi91Aa9Wyw@mail.gmail.com>

Tim Henigan <tim.henigan@gmail.com> writes:

> So the only outstanding changes that I am planning are:
>   1) Remove SUBDIRECTORY_OK
>   2) Add tests for the new '--dir-diff' option
>
> Would it be better to resend the complete patches series with these
> changes or just add new patches to the end?

For the former, a replacement patch ("[PATCH v3 7/9]" with "this replaces
patch 5/9 from the v2" after "---" line) for the ones that need replacing
is preferred, as the topic is still in 'pu'.  For the latter, we can go
either with a separate patch "[PATCH v3 10/9]" or an update to the one
that finishes introduction of the new option.

> Please let me know if I missed anything else.

I think I saw t7800 failed with this series somewhwere around "last flag
wins" test.