git: b9c2beb17b - main - committer-guide: master->main rename in an example or two
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=b9c2beb17bbb78591ccad1078705f67fe48e6055 commit b9c2beb17bbb78591ccad1078705f67fe48e6055 Author: Warner Losh <[email protected]> AuthorDate: 2021-04-26 16:11:32 +0000 Commit: Warner Losh <[email protected]> CommitDate: 2021-04-26 16:20:16 +0000 committer-guide: master->main rename in an example or two These instances of master or freebsd/master which should really be main. I did these examples against the old github mirror. Sponsored by: Netflix --- documentation/content/en/articles/committers-guide/_index.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index e47a0ddff2..1799f8d47e 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -435,11 +435,11 @@ The good version will be the last one you checked out. If you want to know the last version you checked out, you should use 'git reflog': [source,shell] .... -5ef0bd68b515 (HEAD -> master, freebsd/master, freebsd/HEAD) HEAD@{0}: pull --ff-only: Fast-forward -a8163e165c5b (upstream/master) HEAD@{1}: checkout: moving from b6fb97efb682994f59b21fe4efb3fcfc0e5b9eeb to master +5ef0bd68b515 (HEAD -> main, freebsd/main, freebsd/HEAD) HEAD@{0}: pull --ff-only: Fast-forward +a8163e165c5b (upstream/main) HEAD@{1}: checkout: moving from b6fb97efb682994f59b21fe4efb3fcfc0e5b9eeb to main ... .... -shows me moving the working tree to the master branch (a816...) and then updating from upstream (to 5ef0...). +shows me moving the working tree to the main branch (a816...) and then updating from upstream (to 5ef0...). In this case, bad would be HEAD (or 5rf0bd68) and good would be a8163e165. As you can see from the output, HEAD@{1} also often works, but isn't foolproof if you have done other things to your Git tree after updating, but before you discover the need to bisect. ==== _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all To unsubscribe, send any mail to "[email protected]"