git: 60326f6731 - main - git primer: Fix push command

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Warner Losh <imp_at_FreeBSD.org>
Date: Sat, 28 Jan 2023 21:38:23 UTC

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/doc/commit/?id=60326f67313a2b69d73d6394c8fbcdaea57b5310

commit 60326f67313a2b69d73d6394c8fbcdaea57b5310
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-01-28 21:25:29 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-01-28 21:25:29 +0000

    git primer: Fix push command
    
    The instructions leave one on the merge_results branch, not on main, so
    pushing the remote repo won't work. You have to specifically add the
    branch name on the push for that to work.
    
    Noticed by:     sjg
    Sponsored by:   Netflix
---
 documentation/content/en/articles/committers-guide/_index.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index dd67ca83f7..2974cf05cd 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -1496,7 +1496,7 @@ After review, when you are sure it is a good change, you can push it to the Free
 
 [source,shell]
 ....
-% git push freebsd main
+% git push freebsd merge_results:main
 ....
 
 === Creating a new vendor branch