]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/Reintegrate: allow 'pick' to be empty
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2024 21:27:35 +0000 (14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2024 21:27:35 +0000 (14:27 -0700)
Reintegrate

index cb5040405b34807deb411fa16f072cd3f852a16c..cf74e4394f10c5db294fac43337d6ecc65bb9599 100755 (executable)
@@ -288,7 +288,7 @@ no)
 
                        mark_cut
 
-                       git cherry-pick "$branch" || leave $? ;;
+                       git cherry-pick --allow-empty "$branch" || leave $? ;;
                *) echo >&2 "Eh? $branch $eh"; leave $? ;;
                esac