diff options
authorWarner Losh <imp@FreeBSD.org>2023-01-29 02:23:29 +0000
committerWarner Losh <imp@FreeBSD.org>2023-01-29 02:23:29 +0000
commit1e28a7874537a29cd4b10c6503079d6d7316d2e4 (patch)
parent60326f67313a2b69d73d6394c8fbcdaea57b5310 (diff)
git primer: Fix two errors
Recommend pushing HEAD:main in the vendor branch docs, since that's always going to be right. Stop recommending people set push.default to 'freebsd'. It's an enumerated value that's not a branch name. Most likely correct value here is 'upstream'. However, there's enough people with asymetrical setups that I'm just removing the setup rather than describe all the special cases. Sponsored by: Netflix
1 files changed, 1 insertions, 8 deletions
diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index 2974cf05cd..41ef2a507a 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -425,13 +425,6 @@ For pushing, either specify the full refspec:
git push freebsd HEAD:refs/internal/admin
-Or set `push.default` to `freebsd` which will make `git push` to push the current branch back to its upstream by default, which is more suitable for our workflow:
-git config push.default freebsd
==== Keeping Current With The FreeBSD src Tree
First step: cloning a tree.
@@ -1496,7 +1489,7 @@ After review, when you are sure it is a good change, you can push it to the Free
-% git push freebsd merge_results:main
+% git push freebsd HEAD:main
=== Creating a new vendor branch