summaryrefslogtreecommitdiff
path: root/Reintegrate
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-01-27 00:21:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-01-27 00:21:34 (GMT)
commit783534b26f8357a565d7688a28918350142952f8 (patch)
tree1e23e9cd09c4cbf23c7d767994167ba63c861674 /Reintegrate
parent1ed08b0caa4274b00f0475ee182f67a955fdc213 (diff)
downloadgit-783534b26f8357a565d7688a28918350142952f8.zip
git-783534b26f8357a565d7688a28918350142952f8.tar.gz
git-783534b26f8357a565d7688a28918350142952f8.tar.bz2
Meta/cook: 'Still doing something' is another keyphrase
Diffstat (limited to 'Reintegrate')
-rwxr-xr-xReintegrate2
1 files changed, 1 insertions, 1 deletions
diff --git a/Reintegrate b/Reintegrate
index 8dee292..9761caf 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -29,7 +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 / ||
+ /^Can wait in / || /^Still / ||
/^Needs? / || /^Expecting / || /^May want to /) {
return 1;
}