Re: [PATCH v2 18/31] rebase: extract merge code to new source file

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Jeff King <peff@xxxxxxxx> 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.
--
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


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]