projects
/
tools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3b4084c
)
pick-to-branch: make sure that local branch is up-to-date
author
Dr. David von Oheimb
<David.von.Oheimb@siemens.com>
Mon, 8 Nov 2021 11:52:31 +0000
(12:52 +0100)
committer
Tomas Mraz
<tomas@openssl.org>
Mon, 22 Nov 2021 14:05:51 +0000
(15:05 +0100)
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/98)
review-tools/pick-to-branch
patch
|
blob
|
history
diff --git
a/review-tools/pick-to-branch
b/review-tools/pick-to-branch
index a953252b6273846ee632678279fd7065381adf1a..18a25e56db78a4adbb22b8e0cdf39f91c16b491e 100755
(executable)
--- a/
review-tools/pick-to-branch
+++ b/
review-tools/pick-to-branch
@@
-97,6
+97,7
@@
trap 'cleanup' EXIT
git checkout --quiet master
git checkout $branch
+git pull --ff-only
git cherry-pick -e -x $id || (git cherry-pick --abort; exit 1)
while true