]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/Reintegrate: pick up "Can wait in", too
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Nov 2013 00:18:07 +0000 (16:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Nov 2013 00:18:07 +0000 (16:18 -0800)
Reintegrate

index 45e384c0aab486e6a669ea215e1baa42d1e6af40..2f399461722f1420a0f733f2843a36d572b07f49 100755 (executable)
@@ -29,6 +29,7 @@ annotate_merge () {
                        s/^\s*//;
                        if (/^Will (?:\S+ ){0,2}(fast-track|keep|merge|drop|discard|cook|kick|defer|be re-?rolled)[,. ]/ ||
                            /^Not urgent/ || /^Not ready/ || /^Waiting for / ||
+                           /^Can wait in / ||
                            /^Needs? / || /^Expecting / || /^May want to /) {
                                return 1;
                        }