git: 1e28a78745 - main - git primer: Fix two errors

Warner Losh <[email protected]>
Newsgroups gmane.os.freebsd.devel.cvs.doc
Message-ID <[email protected]>
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/doc/commit/?id=1e28a7874537a29cd4b10c6503079d6d7316d2e4

commit 1e28a7874537a29cd4b10c6503079d6d7316d2e4
Author:     Warner Losh <[email protected]>
AuthorDate: 2023-01-29 02:23:29 +0000
Commit:     Warner Losh <[email protected]>
CommitDate: 2023-01-29 02:23:29 +0000

    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
---
 documentation/content/en/articles/committers-guide/_index.adoc | 9 +--------
 1 file changed, 1 insertion(+), 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:
-
-[source,shell]
-....
-git config push.default freebsd
-....
-
 ==== Keeping Current With The FreeBSD src Tree
 [[keeping_current]]
 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
 
 [source,shell]
 ....
-% git push freebsd merge_results:main
+% git push freebsd HEAD:main
 ....
 
 === Creating a new vendor branch
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.