projects
/
tools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3bfc3b4
)
ghmerge: correct assignment to WORK_USED
author
Dr. David von Oheimb
<David.von.Oheimb@siemens.com>
Mon, 22 Nov 2021 11:52:44 +0000
(12:52 +0100)
committer
Tomas Mraz
<tomas@openssl.org>
Mon, 22 Nov 2021 13:54:46 +0000
(14:54 +0100)
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/97)
review-tools/ghmerge
patch
|
blob
|
history
diff --git
a/review-tools/ghmerge
b/review-tools/ghmerge
index 48bc03c1bb50971f21314a871a811f3d8c17c257..2bd8ee966a69d701f1bce29dd0759b2e58d20ec7 100755
(executable)
--- a/
review-tools/ghmerge
+++ b/
review-tools/ghmerge
@@
-202,7
+202,6
@@
REBASING=1
git pull $REMOTE $TARGET || exit 1
REBASING=
-WORK_USED=$WORK
# append new commits from $REPO/$BRANCH
if [ "$PICK" == "no" ]; then
echo Rebasing $REPO/$BRANCH on $TARGET...