From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 Feb 2011 20:24:54 GMT
Subject: Re: [PATCH v2 18/31] rebase: extract merge code to new source file
Message-ID: <7vwrkn9815.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20110225090238.GB16861@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> Looks right, but...
>
>> @@ -382,6 +379,9 @@ SCRIPT_SH += git-web--browse.sh
>>  SCRIPT_LIB += git-mergetool--lib
>>  SCRIPT_LIB += git-parse-remote
>>  SCRIPT_LIB += git-sh-setup
>> +SCRIPT_LIB += git-rebase--am.sh
>> +SCRIPT_LIB += git-rebase--interactive.sh
>> +SCRIPT_LIB += git-rebase--merge.sh
>
> We usually keep these sorted.

Also SCRIPT_LIB omits .sh (which feels inconsistent) and the above will
break the build.

No need to resend, as I've already fixed it up.

Thanks.