projects
/
tools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a3215cf
)
Add --tools flag
author
Rich Salz
<rsalz@akamai.com>
Mon, 21 May 2018 12:13:07 +0000
(08:13 -0400)
committer
Rich Salz
<rsalz@akamai.com>
Mon, 21 May 2018 20:09:23 +0000
(16:09 -0400)
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/tools/pull/14)
review-tools/ghmerge
patch
|
blob
|
history
diff --git
a/review-tools/ghmerge
b/review-tools/ghmerge
index ea6b0ec4eaaceb98ab358cf8d16106d8778a01d9..7f00b7c8a1c111095e6e4f5d82ed8c826105473f 100755
(executable)
--- a/
review-tools/ghmerge
+++ b/
review-tools/ghmerge
@@
-12,6
+12,9
@@
if [ ! -d .git ] ; then
exit 1
fi
+if [ "$1" = "--tools" ] ; then
+ WHAT=tools ; MERGE=yes ; BUILD=no ; shift
+fi
if [ "$1" = "--web" ] ; then
WHAT=web ; MERGE=yes ; BUILD=no ; shift
fi
@@
-82,6
+85,7
@@
if [ "$MERGE" == "yes" ] ; then
else
git rebase $WORK
fi
+
# echo Rebuilding
# opensslbuild |& tail -3