[llvm] 3631e08 - [Doc] Update branch name in Phabricator documentation
Alexey Bader via llvm-commits
llvm-commits at lists.llvm.org
Thu Dec 10 11:25:19 PST 2020
Author: Alexey Bader
Date: 2020-12-10T22:25:04+03:00
New Revision: 3631e080c4e85b762fffce63abfe3aadfa43884b
URL: https://github.com/llvm/llvm-project/commit/3631e080c4e85b762fffce63abfe3aadfa43884b
DIFF: https://github.com/llvm/llvm-project/commit/3631e080c4e85b762fffce63abfe3aadfa43884b.diff
LOG: [Doc] Update branch name in Phabricator documentation
master -> main
Differential Revision: https://reviews.llvm.org/D93020
Added:
Modified:
llvm/docs/Phabricator.rst
Removed:
################################################################################
diff --git a/llvm/docs/Phabricator.rst b/llvm/docs/Phabricator.rst
index 6df1a8b755c4..cbc7c34eab68 100644
--- a/llvm/docs/Phabricator.rst
+++ b/llvm/docs/Phabricator.rst
@@ -200,7 +200,7 @@ click Submit. Note the review must have been Accepted first.
Committing someone's change from Phabricator
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-On a clean Git repository on an up to date ``master`` branch run the
+On a clean Git repository on an up to date ``main`` branch run the
following (where ``<Revision>`` is the Phabricator review number):
::
@@ -209,7 +209,7 @@ following (where ``<Revision>`` is the Phabricator review number):
This will create a new branch called ``arcpatch-D<Revision>`` based on the
-current ``master`` and will create a commit corresponding to ``D<Revision>`` with a
+current ``main`` and will create a commit corresponding to ``D<Revision>`` with a
commit message derived from information in the Phabricator review.
Check you are happy with the commit message and amend it if necessary.
@@ -225,10 +225,10 @@ the following:
::
- git pull --rebase https://github.com/llvm/llvm-project.git master
+ git pull --rebase https://github.com/llvm/llvm-project.git main
git show # Ensure the patch looks correct.
ninja check-$whatever # Rerun the appropriate tests if needed.
- git push https://github.com/llvm/llvm-project.git HEAD:master
+ git push https://github.com/llvm/llvm-project.git HEAD:main
Abandoning a change
More information about the llvm-commits
mailing list