Date: Sun, 29 Jun 2025 20:28:16 GMT From: Edson Brandi <ebrandi@FreeBSD.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Subject: git: 5d7bdaf4d5 - main - doc: Update source files (en .po), for translations Message-ID: <202506292028.55TKSGvX044560@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ebrandi: URL: https://cgit.FreeBSD.org/doc/commit/?id=5d7bdaf4d53f27f6c9c3abdd63b67e21949f294b commit 5d7bdaf4d53f27f6c9c3abdd63b67e21949f294b Author: Edson Brandi <ebrandi@FreeBSD.org> AuthorDate: 2025-06-29 20:26:22 +0000 Commit: Edson Brandi <ebrandi@FreeBSD.org> CommitDate: 2025-06-29 20:26:22 +0000 doc: Update source files (en .po), for translations --- .../content/en/articles/committers-guide/_index.po | 1567 +-- .../content/en/articles/pgpkeys/_index.po | 732 +- .../content/en/articles/vm-design/_index.po | 318 +- .../developers-handbook/kerneldebug/_index.po | 60 +- .../books/developers-handbook/policies/_index.po | 4 +- .../en/books/developers-handbook/tools/_index.po | 5 +- documentation/content/en/books/faq/_index.po | 310 +- .../en/books/handbook/cutting-edge/_index.po | 4 +- .../content/en/books/handbook/firewalls/_index.po | 4 +- .../content/en/books/handbook/glossary.po | 199 +- .../content/en/books/handbook/introduction.po | 4 +- .../en/books/handbook/network-servers/_index.po | 591 +- .../content/en/books/handbook/network/_index.po | 508 +- .../content/en/books/handbook/wayland/_index.po | 4 +- .../content/en/books/handbook/x11/_index.po | 20 +- .../content/en/books/handbook/zfs/_index.po | 4 +- .../en/books/porters-handbook/makefiles/_index.po | 3314 +++--- .../en/books/porters-handbook/uses/_index.po | 2225 ++-- .../en/books/porters-handbook/versions/_index.po | 11659 ++++++++++--------- 19 files changed, 10744 insertions(+), 10788 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.po b/documentation/content/en/articles/committers-guide/_index.po index 1dee22ffb3..9585f882ca 100644 --- a/documentation/content/en/articles/committers-guide/_index.po +++ b/documentation/content/en/articles/committers-guide/_index.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: FreeBSD Documentation VERSION\n" -"POT-Creation-Date: 2025-05-01 19:56-0300\n" +"POT-Creation-Date: 2025-06-29 21:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -513,7 +513,7 @@ msgstr "" #. type: Table #: documentation/content/en/articles/committers-guide/_index.adoc:247 #, no-wrap -msgid "core@" +msgid "srcmgr@" msgstr "" #. type: Table @@ -614,7 +614,7 @@ msgstr "" #: documentation/content/en/articles/committers-guide/_index.adoc:271 msgid "" "Committers can acquire an additional bit by the usual process of finding a " -"mentor who will propose them to core, doceng, or portmgr, as appropriate. " +"mentor who will propose them to srcmgr, doceng, or portmgr, as appropriate. " "When approved, they will be added to 'access' and the normal mentoring " "period will ensue, which will involve a continuing of \"Approved by\" for " "some period." @@ -1320,7 +1320,7 @@ msgstr "" #. type: Plain text #: documentation/content/en/articles/committers-guide/_index.adoc:580 -#: documentation/content/en/articles/committers-guide/_index.adoc:1737 +#: documentation/content/en/articles/committers-guide/_index.adoc:1744 #, no-wrap msgid " git checkout -b <new-branch-name>\n" msgstr "" @@ -2036,30 +2036,31 @@ msgstr "" #: documentation/content/en/articles/committers-guide/_index.adoc:1582 #: documentation/content/en/articles/committers-guide/_index.adoc:1611 #: documentation/content/en/articles/committers-guide/_index.adoc:1627 -#: documentation/content/en/articles/committers-guide/_index.adoc:1660 -#: documentation/content/en/articles/committers-guide/_index.adoc:1681 -#: documentation/content/en/articles/committers-guide/_index.adoc:1712 -#: documentation/content/en/articles/committers-guide/_index.adoc:1724 -#: documentation/content/en/articles/committers-guide/_index.adoc:1755 +#: documentation/content/en/articles/committers-guide/_index.adoc:1638 +#: documentation/content/en/articles/committers-guide/_index.adoc:1667 +#: documentation/content/en/articles/committers-guide/_index.adoc:1688 +#: documentation/content/en/articles/committers-guide/_index.adoc:1719 +#: documentation/content/en/articles/committers-guide/_index.adoc:1731 #: documentation/content/en/articles/committers-guide/_index.adoc:1764 -#: documentation/content/en/articles/committers-guide/_index.adoc:1774 -#: documentation/content/en/articles/committers-guide/_index.adoc:1790 -#: documentation/content/en/articles/committers-guide/_index.adoc:1806 +#: documentation/content/en/articles/committers-guide/_index.adoc:1773 +#: documentation/content/en/articles/committers-guide/_index.adoc:1785 +#: documentation/content/en/articles/committers-guide/_index.adoc:1801 #: documentation/content/en/articles/committers-guide/_index.adoc:1817 -#: documentation/content/en/articles/committers-guide/_index.adoc:1824 -#: documentation/content/en/articles/committers-guide/_index.adoc:1837 -#: documentation/content/en/articles/committers-guide/_index.adoc:1857 -#: documentation/content/en/articles/committers-guide/_index.adoc:1871 -#: documentation/content/en/articles/committers-guide/_index.adoc:1887 -#: documentation/content/en/articles/committers-guide/_index.adoc:1899 +#: documentation/content/en/articles/committers-guide/_index.adoc:1828 +#: documentation/content/en/articles/committers-guide/_index.adoc:1835 +#: documentation/content/en/articles/committers-guide/_index.adoc:1848 +#: documentation/content/en/articles/committers-guide/_index.adoc:1868 +#: documentation/content/en/articles/committers-guide/_index.adoc:1882 +#: documentation/content/en/articles/committers-guide/_index.adoc:1906 #: documentation/content/en/articles/committers-guide/_index.adoc:1918 -#: documentation/content/en/articles/committers-guide/_index.adoc:1929 -#: documentation/content/en/articles/committers-guide/_index.adoc:1939 -#: documentation/content/en/articles/committers-guide/_index.adoc:1979 -#: documentation/content/en/articles/committers-guide/_index.adoc:1987 +#: documentation/content/en/articles/committers-guide/_index.adoc:1937 +#: documentation/content/en/articles/committers-guide/_index.adoc:1948 +#: documentation/content/en/articles/committers-guide/_index.adoc:1958 #: documentation/content/en/articles/committers-guide/_index.adoc:1998 -#: documentation/content/en/articles/committers-guide/_index.adoc:2019 -#: documentation/content/en/articles/committers-guide/_index.adoc:2080 +#: documentation/content/en/articles/committers-guide/_index.adoc:2006 +#: documentation/content/en/articles/committers-guide/_index.adoc:2017 +#: documentation/content/en/articles/committers-guide/_index.adoc:2038 +#: documentation/content/en/articles/committers-guide/_index.adoc:2099 #, no-wrap msgid "[source,shell]\n" msgstr "" @@ -3403,9 +3404,9 @@ msgstr "" #: documentation/content/en/articles/committers-guide/_index.adoc:1615 #, no-wrap msgid "" -"% git branch issue # Create the 'issue' branch\n" -"% git reset --hard freebsd/main # Reset 'main' back to the official tip\n" -"% git checkout issue # Back to where you were\n" +"% git checkout -b issue # Create the 'issue' branch\n" +"% git checkout -B main freebsd/main # Reset main to upstream\n" +"% git checkout issue # Back to where you were\n" msgstr "" #. type: Title ===== @@ -3441,21 +3442,29 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1637 +#: documentation/content/en/articles/committers-guide/_index.adoc:1636 +#, no-wrap +msgid "If it is not the last commit, you can cherry-pick that one change from wilma onto fred, then use `git rebase -i` to remove the change from wilma.\n" +msgstr "" + +#. type: Plain text +#: documentation/content/en/articles/committers-guide/_index.adoc:1643 #, no-wrap msgid "" -"Git experts would first rewind the wilma branch by 1 commit, switch over to fred and then use `git reflog` to see what that 1 deleted commit was and\n" -"cherry-pick it over.\n" +"# We're on branch wilma\n" +"% git checkout fred\t\t\t# move to fred branch\n" +"% git cherry-pick HASH_OF_CHANGE\t# copy the misplaced commit\n" +"% git rebase -i main wilma\t\t# drop the cherry-picked change\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1639 +#: documentation/content/en/articles/committers-guide/_index.adoc:1646 #, no-wrap msgid "**Q:** But what if I want to commit a few changes to `main`, but keep the rest in `wilma` for some reason?\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1645 +#: documentation/content/en/articles/committers-guide/_index.adoc:1652 #, no-wrap msgid "" "**A:** The same technique above also works if you are wanting to 'land' parts of the branch you are working on into `main` before the rest of the branch is ready (say you noticed an unrelated typo, or fixed an incidental bug).\n" @@ -3466,13 +3475,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1647 +#: documentation/content/en/articles/committers-guide/_index.adoc:1654 #, no-wrap msgid "**Q:** I want to split off some changes from branch `wilma` into branch `fred`\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1653 +#: documentation/content/en/articles/committers-guide/_index.adoc:1660 #, no-wrap msgid "" "**A:** The more general answer would be the same as the previous.\n" @@ -3483,7 +3492,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1658 +#: documentation/content/en/articles/committers-guide/_index.adoc:1665 #, no-wrap msgid "" "The other way to do this would be to checkout `wilma` and then create the branch `fred` to point to the same point in the tree.\n" @@ -3493,7 +3502,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1665 +#: documentation/content/en/articles/committers-guide/_index.adoc:1672 msgid "" "% git checkout pre-split\t# Go back % git branch -D fred\t\t# delete the " "fred branch % git checkout -B wilma\t\t# reset the wilma branch % git branch " @@ -3501,7 +3510,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1669 +#: documentation/content/en/articles/committers-guide/_index.adoc:1676 #, no-wrap msgid "" "The last step is optional.\n" @@ -3509,7 +3518,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1673 +#: documentation/content/en/articles/committers-guide/_index.adoc:1680 #, no-wrap msgid "" "**Q:** But I did things as I read along and didn't see your advice at the end to create a branch, and now `fred` and `wilma` are all screwed up.\n" @@ -3518,13 +3527,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1675 +#: documentation/content/en/articles/committers-guide/_index.adoc:1682 #, no-wrap msgid "**A:** All is not lost. You can figure out it, so long as it hasn't been too long, or too many commits (hundreds).\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1679 +#: documentation/content/en/articles/committers-guide/_index.adoc:1686 #, no-wrap msgid "" "So I created a wilma branch and committed a couple of things to it, then decided I wanted to split it into fred and wilma.\n" @@ -3533,7 +3542,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1694 +#: documentation/content/en/articles/committers-guide/_index.adoc:1701 msgid "" "% git reflog 6ff9c25 (HEAD -> wilma) HEAD@{0}: rebase -i (finish): returning " "to refs/heads/wilma 6ff9c25 (HEAD -> wilma) HEAD@{1}: rebase -i (start): " @@ -3546,7 +3555,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1702 +#: documentation/content/en/articles/committers-guide/_index.adoc:1709 #, no-wrap msgid "" "Here we see the changes I've made.\n" @@ -3558,7 +3567,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1710 +#: documentation/content/en/articles/committers-guide/_index.adoc:1717 #, no-wrap msgid "" "Next, 'Encourage contributions' was the last commit I made to `wilma` before I decided to split things up.\n" @@ -3571,12 +3580,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1715 +#: documentation/content/en/articles/committers-guide/_index.adoc:1722 msgid "% git checkout -B wilma 869cbd3 % git branch -D fred" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1722 +#: documentation/content/en/articles/committers-guide/_index.adoc:1729 #, no-wrap msgid "" "and you are ready to try again.\n" @@ -3587,12 +3596,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1728 +#: documentation/content/en/articles/committers-guide/_index.adoc:1735 msgid "% git checkout 869cbd3 M\tfaq.md Note: checking out '869cbd3'." msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1732 +#: documentation/content/en/articles/committers-guide/_index.adoc:1739 msgid "" "You are in 'detached HEAD' state. You can look around, make experimental " "changes and commit them, and you can discard any commits you make in this " @@ -3600,31 +3609,31 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1735 +#: documentation/content/en/articles/committers-guide/_index.adoc:1742 msgid "" "If you want to create a new branch to retain commits you create, you may do " "so (now or later) by using -b with the checkout command again. Example:" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1740 +#: documentation/content/en/articles/committers-guide/_index.adoc:1747 msgid "HEAD is now at 869cbd3 Encourage contributions % git checkout -B wilma" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1743 +#: documentation/content/en/articles/committers-guide/_index.adoc:1750 #, no-wrap msgid "this produces the same effect, but I have to read a lot more and severed heads aren't an image I like to contemplate.\n" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1744 +#: documentation/content/en/articles/committers-guide/_index.adoc:1751 #, no-wrap msgid "Ooops! I did a `git pull` and it created a merge commit, what do I do?" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1748 +#: documentation/content/en/articles/committers-guide/_index.adoc:1755 #, no-wrap msgid "" "**Q:** I was on autopilot and did a `git pull` for my development tree and that created a merge commit on `main`.\n" @@ -3632,13 +3641,19 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1750 +#: documentation/content/en/articles/committers-guide/_index.adoc:1757 #, no-wrap msgid "**A:** This can happen when you invoke the pull with your development branch checked out.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1753 +#: documentation/content/en/articles/committers-guide/_index.adoc:1759 +#, no-wrap +msgid "Many developers use `git pull --rebase` to avoid this situation.\n" +msgstr "" + +#. type: delimited block . 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:1762 #, no-wrap msgid "" "Right after the pull, you will have the new merge commit checked out.\n" @@ -3646,7 +3661,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1758 +#: documentation/content/en/articles/committers-guide/_index.adoc:1767 #, no-wrap msgid "" "git log --oneline HEAD^1 # Look at the first parent's commits\n" @@ -3654,7 +3669,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1762 +#: documentation/content/en/articles/committers-guide/_index.adoc:1771 #, no-wrap msgid "" "From those logs, you can easily identify which commit is your development work.\n" @@ -3662,18 +3677,24 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1766 -msgid "git reset --hard HEAD^2" +#: documentation/content/en/articles/committers-guide/_index.adoc:1775 +msgid "git reset --hard HEAD^1" +msgstr "" + +#. type: delimited block . 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:1778 +#, no-wrap +msgid "In addition, a `git pull --rebase` at this stage will rebase your changes to 'main' to the latest 'freebsd/main'.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1769 +#: documentation/content/en/articles/committers-guide/_index.adoc:1780 #, no-wrap msgid "**Q:** But I also need to fix my `main` branch. How do I do that?\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1772 +#: documentation/content/en/articles/committers-guide/_index.adoc:1783 #, no-wrap msgid "" "**A:** Git keeps track of the remote repository branches in a `freebsd/` namespace.\n" @@ -3681,12 +3702,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1776 +#: documentation/content/en/articles/committers-guide/_index.adoc:1787 msgid "git branch -f main freebsd/main" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1781 +#: documentation/content/en/articles/committers-guide/_index.adoc:1792 #, no-wrap msgid "" "There's nothing magical about branches in Git: they are just labels on a graph that are automatically moved forward by making commits.\n" @@ -3695,13 +3716,13 @@ msgid "" msgstr "" #. type: Title ===== -#: documentation/content/en/articles/committers-guide/_index.adoc:1782 +#: documentation/content/en/articles/committers-guide/_index.adoc:1793 #, no-wrap msgid "Mixing and matching branches" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1786 +#: documentation/content/en/articles/committers-guide/_index.adoc:1797 #, no-wrap msgid "" "**Q:** So I have two branches `worker` and `async` that I'd like to combine into one branch called `feature`\n" @@ -3709,20 +3730,20 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1788 +#: documentation/content/en/articles/committers-guide/_index.adoc:1799 #, no-wrap msgid "**A:** This is a job for cherry pick.\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1794 +#: documentation/content/en/articles/committers-guide/_index.adoc:1805 msgid "" "% git checkout worker % git checkout -b feature\t# create a new branch % git " "cherry-pick main..async\t# bring in the changes" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1799 +#: documentation/content/en/articles/committers-guide/_index.adoc:1810 #, no-wrap msgid "" "You now have a new branch called `feature`.\n" @@ -3731,13 +3752,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1801 +#: documentation/content/en/articles/committers-guide/_index.adoc:1812 #, no-wrap msgid "**Q:** I have a branch called `driver` and I'd like to break it up into `kernel` and `userland` so I can evolve them separately and commit each branch as it becomes ready.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1804 +#: documentation/content/en/articles/committers-guide/_index.adoc:1815 #, no-wrap msgid "" "**A:** This takes a little bit of prep work, but `git rebase` will do the heavy\n" @@ -3745,14 +3766,14 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1810 +#: documentation/content/en/articles/committers-guide/_index.adoc:1821 msgid "" "% git checkout driver\t\t# Checkout the driver % git checkout -b kernel\t# " "Create kernel branch % git checkout -b userland\t# Create userland branch" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1815 +#: documentation/content/en/articles/committers-guide/_index.adoc:1826 #, no-wrap msgid "" "Now you have two identical branches.\n" @@ -3761,29 +3782,29 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1819 +#: documentation/content/en/articles/committers-guide/_index.adoc:1830 msgid "% git rebase -i main kernel" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1822 +#: documentation/content/en/articles/committers-guide/_index.adoc:1833 #, no-wrap msgid "and just include the changes you want (with a 'p' or 'pick' line) and just delete the commits you don't (this sounds scary, but if worse comes to worse, you can throw this all away and start over with the `driver` branch since you've not yet moved it).\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1826 +#: documentation/content/en/articles/committers-guide/_index.adoc:1837 msgid "% git rebase -i main userland" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1829 +#: documentation/content/en/articles/committers-guide/_index.adoc:1840 #, no-wrap msgid "and do the same thing you did with the `kernel` branch.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1832 +#: documentation/content/en/articles/committers-guide/_index.adoc:1843 #, no-wrap msgid "" "**Q:** Oh great! I followed the above and forgot a commit in the `kernel` branch.\n" @@ -3791,7 +3812,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1835 +#: documentation/content/en/articles/committers-guide/_index.adoc:1846 #, no-wrap msgid "" "**A:** You can use the `driver` branch to find the hash of the commit is missing and\n" @@ -3799,12 +3820,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1841 +#: documentation/content/en/articles/committers-guide/_index.adoc:1852 msgid "% git checkout kernel % git log driver % git cherry-pick $HASH" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1847 +#: documentation/content/en/articles/committers-guide/_index.adoc:1858 #, no-wrap msgid "" "**Q:** OK. I have the same situation as the above, but my commits are all mixed up.\n" @@ -3814,7 +3835,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1850 +#: documentation/content/en/articles/committers-guide/_index.adoc:1861 #, no-wrap msgid "" "**A:** In this situation, you'd be better off to curate the original branch to separate\n" @@ -3822,7 +3843,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1855 +#: documentation/content/en/articles/committers-guide/_index.adoc:1866 #, no-wrap msgid "" "So let's assume that there's just one commit with a clean tree.\n" @@ -3832,18 +3853,18 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1859 +#: documentation/content/en/articles/committers-guide/_index.adoc:1870 msgid "% git reset HEAD^" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1862 +#: documentation/content/en/articles/committers-guide/_index.adoc:1873 #, no-wrap msgid "Note: Do not, repeat do not, add `--hard` here since that also removes the changes from your tree.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1866 +#: documentation/content/en/articles/committers-guide/_index.adoc:1877 #, no-wrap msgid "" "Now, if you are lucky, the change needing to be split up falls entirely along file lines.\n" @@ -3852,7 +3873,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1869 +#: documentation/content/en/articles/committers-guide/_index.adoc:1880 #, no-wrap msgid "" "If you are not lucky, you'll need to split apart files.\n" @@ -3860,12 +3881,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1873 +#: documentation/content/en/articles/committers-guide/_index.adoc:1884 msgid "git add -i foo/bar.c" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1879 +#: documentation/content/en/articles/committers-guide/_index.adoc:1890 #, no-wrap msgid "" "will step through the diffs, prompting you, one at time, whether to include or exclude the hunk.\n" @@ -3874,31 +3895,52 @@ msgid "" "and use the `git rebase -i` to fold the related commits together).\n" msgstr "" +#. type: Title ===== +#: documentation/content/en/articles/committers-guide/_index.adoc:1891 +#, no-wrap +msgid "Joining the FreeBSD GitHub oranization." +msgstr "" + +#. type: delimited block . 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:1894 +#, no-wrap +msgid "**Q:** How do I join the FreeBSD GitHub organization?\n" +msgstr "" + +#. type: delimited block . 4 +#: documentation/content/en/articles/committers-guide/_index.adoc:1898 +#, no-wrap +msgid "" +"**A:** Please see https://wiki.freebsd.org/GitHub#Joining_the_Organisation[our GitHub Wiki Info] page for details.\n" +"Briefly, all FreeBSD committers may join.\n" +"Those who are not committers who request joining will be considered on a case by case basis.\n" +msgstr "" + #. type: Title ==== -#: documentation/content/en/articles/committers-guide/_index.adoc:1880 +#: documentation/content/en/articles/committers-guide/_index.adoc:1899 #, no-wrap msgid "Cloning and Mirroring" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1883 +#: documentation/content/en/articles/committers-guide/_index.adoc:1902 #, no-wrap msgid "**Q:** I'd like to mirror the entire Git repository, how do I do that?\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1885 +#: documentation/content/en/articles/committers-guide/_index.adoc:1904 #, no-wrap msgid "**A:** If all you want to do is mirror, then\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1889 +#: documentation/content/en/articles/committers-guide/_index.adoc:1908 msgid "% git clone --mirror $URL" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1893 +#: documentation/content/en/articles/committers-guide/_index.adoc:1912 #, no-wrap msgid "" "will do the trick.\n" @@ -3906,7 +3948,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1897 +#: documentation/content/en/articles/committers-guide/_index.adoc:1916 #, no-wrap msgid "" "First, this is a 'bare repository' which has the repository database, but no checked out worktree.\n" @@ -3915,7 +3957,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1905 +#: documentation/content/en/articles/committers-guide/_index.adoc:1924 msgid "" "% git clone --mirror https://git.freebsd.org/ports.git ports.git % cd " "ports.git % git worktree add ../ports main % git worktree add ../quarterly " @@ -3923,13 +3965,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1908 +#: documentation/content/en/articles/committers-guide/_index.adoc:1927 #, no-wrap msgid "But if you aren't using your mirror for further local clones, then it's a poor match.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1911 +#: documentation/content/en/articles/committers-guide/_index.adoc:1930 #, no-wrap msgid "" "The second disadvantage is that Git normally rewrites the refs (branch name, tags, etc) from upstream so that your local refs can evolve independently of upstream.\n" @@ -3937,13 +3979,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1913 +#: documentation/content/en/articles/committers-guide/_index.adoc:1932 #, no-wrap msgid "**Q:** So what can I do instead?\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1916 +#: documentation/content/en/articles/committers-guide/_index.adoc:1935 #, no-wrap msgid "" "**A:** Well, you can stuff all of the upstream repository's refs into a private namespace in your local repository.\n" @@ -3951,19 +3993,19 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1920 +#: documentation/content/en/articles/committers-guide/_index.adoc:1939 #, no-wrap msgid " fetch = +refs/heads/*:refs/remotes/freebsd/*\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1923 +#: documentation/content/en/articles/committers-guide/_index.adoc:1942 #, no-wrap msgid "which says just fetch the branch refs.\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1927 +#: documentation/content/en/articles/committers-guide/_index.adoc:1946 #, no-wrap msgid "" "However, the FreeBSD repository has a number of other things in it.\n" @@ -3972,12 +4014,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1931 +#: documentation/content/en/articles/committers-guide/_index.adoc:1950 msgid "git config --add remote.freebsd.fetch '+refs/*:refs/freebsd/*'" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1935 +#: documentation/content/en/articles/committers-guide/_index.adoc:1954 #, no-wrap msgid "" "which will put everything in the upstream repository into your local repository's `refs/freebsd/` namespace.\n" @@ -3985,30 +4027,30 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1937 +#: documentation/content/en/articles/committers-guide/_index.adoc:1956 #, no-wrap msgid "You'll need to refer to these 'refs' with their full name because they aren't in and of Git's regular namespaces.\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1941 +#: documentation/content/en/articles/committers-guide/_index.adoc:1960 msgid "git log refs/freebsd/vendor/zlib/1.2.10" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1944 +#: documentation/content/en/articles/committers-guide/_index.adoc:1963 #, no-wrap msgid "would look at the log for the vendor branch for zlib starting at 1.2.10.\n" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:1945 +#: documentation/content/en/articles/committers-guide/_index.adoc:1964 #, no-wrap msgid "Collaborating with others" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1949 +#: documentation/content/en/articles/committers-guide/_index.adoc:1968 msgid "" "One of the keys to good software development on a project as large as " "FreeBSD is the ability to collaborate with others before you push your " @@ -4020,14 +4062,14 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1951 +#: documentation/content/en/articles/committers-guide/_index.adoc:1970 msgid "" "The following instructions show how to set up a user-generated branch, based " "on the FreeBSD `main` branch, and push it to GitHub." msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1954 +#: documentation/content/en/articles/committers-guide/_index.adoc:1973 msgid "" "Before you begin, make sure that your local Git repo is up to date and has " "the correct origins set crossref:committers-guide[keeping_current,as shown " @@ -4035,14 +4077,14 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1961 +#: documentation/content/en/articles/committers-guide/_index.adoc:1980 msgid "" "[source,shell] ```` % git remote -v freebsd https://git.freebsd.org/src.git " "(fetch) freebsd ssh://git@gitrepo.freebsd.org/src.git (push) ````" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1964 +#: documentation/content/en/articles/committers-guide/_index.adoc:1983 msgid "" "The first step is to create a fork of https://github.com/freebsd/freebsd-" "src[FreeBSD] on GitHub following these https://docs.github.com/en/github/" @@ -4051,14 +4093,14 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1967 +#: documentation/content/en/articles/committers-guide/_index.adoc:1986 msgid "" "Now add a remote on your local system that points to your fork: " "[source,shell]" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1974 +#: documentation/content/en/articles/committers-guide/_index.adoc:1993 msgid "" "% git remote add github git@github.com:gvnn3/freebsd-src.git % git remote -v " "github\tgit@github.com:gvnn3/freebsd-src.git (fetch) " @@ -4068,7 +4110,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1977 +#: documentation/content/en/articles/committers-guide/_index.adoc:1996 #, no-wrap msgid "" "With this in place you can create a branch\n" @@ -4076,12 +4118,12 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1981 +#: documentation/content/en/articles/committers-guide/_index.adoc:2000 msgid "% git checkout -b gnn-pr2001-fix" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1985 +#: documentation/content/en/articles/committers-guide/_index.adoc:2004 #, no-wrap msgid "" "Make whatever modifications you wish in your branch. Build, test, and once you're ready to collaborate with others it's time to push your changes into your hosted branch.\n" @@ -4089,26 +4131,26 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1991 +#: documentation/content/en/articles/committers-guide/_index.adoc:2010 msgid "" "% git push github fatal: The current branch gnn-pr2001-fix has no upstream " "branch. To push the current branch and set the remote as upstream, use" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:1993 +#: documentation/content/en/articles/committers-guide/_index.adoc:2012 #, no-wrap msgid " git push --set-upstream github gnn-pr2001-fix\n" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:1996 +#: documentation/content/en/articles/committers-guide/_index.adoc:2015 #, no-wrap msgid "Setting the push as +git+ advises allows it to succeed:\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2012 +#: documentation/content/en/articles/committers-guide/_index.adoc:2031 #, no-wrap msgid "" "% git push --set-upstream github gnn-feature\n" @@ -4127,7 +4169,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2014 +#: documentation/content/en/articles/committers-guide/_index.adoc:2033 #, no-wrap msgid "" "[new branch] gnn-feature -> gnn-feature\n" @@ -4135,13 +4177,13 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2017 +#: documentation/content/en/articles/committers-guide/_index.adoc:2036 #, no-wrap msgid "Subsequent changes to the same branch will push correctly by default:\n" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2030 +#: documentation/content/en/articles/committers-guide/_index.adoc:2049 #, no-wrap msgid "" "% git push\n" @@ -4157,7 +4199,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2034 +#: documentation/content/en/articles/committers-guide/_index.adoc:2053 #, no-wrap msgid "" "At this point your work is now in your branch on +GitHub+ and you can\n" @@ -4165,19 +4207,19 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2036 +#: documentation/content/en/articles/committers-guide/_index.adoc:2055 #, no-wrap msgid "[[github-pull-land]]\n" msgstr "" #. type: Title === -#: documentation/content/en/articles/committers-guide/_index.adoc:2036 +#: documentation/content/en/articles/committers-guide/_index.adoc:2055 #, no-wrap msgid "Landing a github pull request" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2041 +#: documentation/content/en/articles/committers-guide/_index.adoc:2060 msgid "" "This section documents how to land a GitHub pull request that's submitted " "against the FreeBSD Git mirrors at GitHub. While this is not an official " @@ -4190,7 +4232,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2046 +#: documentation/content/en/articles/committers-guide/_index.adoc:2065 msgid "" "Before beginning, make sure that the local Git repo is up to date and has " "the correct origins set crossref:committers-guide[keeping_current,as shown " @@ -4198,7 +4240,7 @@ msgid "" msgstr "" #. type: Plain text -#: documentation/content/en/articles/committers-guide/_index.adoc:2052 +#: documentation/content/en/articles/committers-guide/_index.adoc:2071 msgid "" "% git remote -v freebsd https://git.freebsd.org/src.git (fetch) freebsd " "ssh://git@gitrepo.freebsd.org/src.git (push) github https://github.com/" @@ -4207,7 +4249,7 @@ msgid "" msgstr "" #. type: delimited block . 4 -#: documentation/content/en/articles/committers-guide/_index.adoc:2072 +#: documentation/content/en/articles/committers-guide/_index.adoc:2091 #, no-wrap msgid "" *** 70657 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202506292028.55TKSGvX044560>