On Fri, Feb 5, 2016 at 12:05 PM, Eric Sunshine <sunshine@xxxxxxxxxxxxxx> wrote: > On Thu, Feb 4, 2016 at 4:03 AM, Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> wrote: >> @@ -732,7 +743,7 @@ static void receive_needs(void) >> if (depth == 0 && !deepen_rev_list && shallows.nr == 0) >> return; >> if (depth > 0 && deepen_rev_list) >> - die("--depth and --shallow-since cannot be used together"); >> + die("--depth and --shallow-since (or --shallow-exclude) cannot be used together"); > > Also, does this change belong in patch 21/25? 21/25 is about client side support, so no, it should belong here. But I probably should not mention client's option names here. After all upload-pack can be used with some other client that names things differently. I think I'm going with something like "git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together". -- Duy -- 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