aboutsummaryrefslogtreecommitdiff
path: root/crypto/openssh/FREEBSD-upgrade
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2021-04-23 19:35:40 +0000
committerEd Maste <emaste@FreeBSD.org>2021-04-23 19:36:42 +0000
commit576b477ba41c9916fae3a83e6b4dd98c682a0c2f (patch)
tree46549e5072b7f9f49eab1355fb1e36fcba53cc93 /crypto/openssh/FREEBSD-upgrade
parent50f5d13eeb8835fe8250d65f033334d7d956d703 (diff)
downloadsrc-576b477ba41c9916fae3a83e6b4dd98c682a0c2f.tar.gz
src-576b477ba41c9916fae3a83e6b4dd98c682a0c2f.zip
openssh: add a note about pushing vendor updates
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'crypto/openssh/FREEBSD-upgrade')
-rw-r--r--crypto/openssh/FREEBSD-upgrade7
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade
index bde003a1d183..397b68dee96f 100644
--- a/crypto/openssh/FREEBSD-upgrade
+++ b/crypto/openssh/FREEBSD-upgrade
@@ -39,6 +39,13 @@
$ git tag -a -m "Tag OpenSSH X.YpZ" vendor/openssh/X.YpZ
+ At this point the vendor branch can be pushed to the FreeBSD repo via:
+
+ $ git push freebsd vendor/openssh
+
+ (It could also be pushed later on, along with the merge to main, but
+ pushing now allows others to collaborate.)
+
08) Check out head and run the pre-merge script, which strips our RCS
tags from files that have them: