Skip to content

Commit 23f7594

Browse files
author
Kartik Sharma
committed
Update cherry_pick_pull.sh
1 parent b38f355 commit 23f7594

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Diff for: hack/cherry_pick_pull.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ for pull in "${PULLS[@]}"; do
180180
(git status --porcelain | grep ^U) || echo "!!! None. Did you git am --continue?"
181181
echo
182182
echo "+++ Please resolve the conflicts in another window (and remember to 'git add / git am --continue')"
183-
read -p "+++ Proceed (anything but 'y' aborts the cherry-pick)? [y/n] " -r
183+
read -p "+++ Proceed (anything other than 'y' aborts the cherry-pick)? [y/n] " -r
184184
echo
185185
if ! [[ "${REPLY}" =~ ^[yY]$ ]]; then
186186
echo "Aborting." >&2
@@ -247,7 +247,7 @@ echo "+++ I'm about to do the following to push to GitHub (and I'm assuming ${FO
247247
echo
248248
echo " git push ${FORK_REMOTE} ${NEWBRANCHUNIQ}:${NEWBRANCH}"
249249
echo
250-
read -p "+++ Proceed (anything but 'y' aborts the cherry-pick)? [y/n] " -r
250+
read -p "+++ Proceed (anything other than 'y' aborts the cherry-pick)? [y/n] " -r
251251
if ! [[ "${REPLY}" =~ ^[yY]$ ]]; then
252252
echo "Aborting." >&2
253253
exit 1

0 commit comments

Comments
 (0)