diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-11-22 00:18:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-22 00:18:07 (GMT) |
| commit | ebf996778d2b9c2e56a81f31d800029d4862240b (patch) | |
| tree | 7fc8d1a247f436d5e16e1b94f6c36954bbada79f /Reintegrate | |
| parent | 540661b37307488d622959d048f84197d167d69d (diff) | |
| download | git-ebf996778d2b9c2e56a81f31d800029d4862240b.zip git-ebf996778d2b9c2e56a81f31d800029d4862240b.tar.gz git-ebf996778d2b9c2e56a81f31d800029d4862240b.tar.bz2 | |
Meta/Reintegrate: pick up "Can wait in", too
Diffstat (limited to 'Reintegrate')
| -rwxr-xr-x | Reintegrate | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Reintegrate b/Reintegrate index 45e384c..2f39946 100755 --- a/Reintegrate +++ b/Reintegrate @@ -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; } |