qiurui
/
freebsd-doc
mirror of https://git.FreeBSD.org/doc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Warner Losh 2021-04-26 10:11:32 -06:00
parent bcf75b25de
commit b9c2beb17b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
documentation/content/en/articles/committers-guide/_index.adoc
View File

@ -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.
====