[PATCH] D92831: Update references to 'master' branch.

[Hafiz Abid Qadeer via Phabricator via llvm-commits]

abidh created this revision.
abidh added reviewers: sqlbyme, sammccall.
abidh added a project: LLVM.
abidh requested review of this revision.
Herald added a subscriber: llvm-commits.

Replace 'master' with 'main' in instructions on how to create and push patches.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D92831

Files:
  llvm/docs/GettingStarted.rst
  llvm/docs/Phabricator.rst


Index: llvm/docs/Phabricator.rst
===================================================================
--- llvm/docs/Phabricator.rst
+++ llvm/docs/Phabricator.rst
@@ -200,7 +200,7 @@
 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 @@
 
 
 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 @@
 
 ::
 
-  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
Index: llvm/docs/GettingStarted.rst
===================================================================
--- llvm/docs/GettingStarted.rst
+++ llvm/docs/GettingStarted.rst
@@ -456,7 +456,7 @@
 
 You'll generally want to make sure your branch has a single commit,
 corresponding to the review you wish to send, up-to-date with the upstream
-``origin/master`` branch, and doesn't contain merges. Once you have that, you
+``origin/main`` branch, and doesn't contain merges. Once you have that, you
 can start `a Phabricator review <Phabricator.html>`_ (or use ``git show`` or
 ``git format-patch`` to output the diff, and attach it to an email message).
 
@@ -500,7 +500,7 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Once a patch is reviewed, you should rebase it, re-test locally, and commit the
-changes to LLVM's master branch. This is done using `git push` if you have the
+changes to LLVM's main branch. This is done using `git push` if you have the
 required access rights. See `committing a change
 <Phabricator.html#committing-a-change>`_ for Phabricator based commits or
 `obtaining commit access <DeveloperPolicy.html#obtaining-commit-access>`_
@@ -514,13 +514,13 @@
   # Go to the branch with your accepted commit.
   % git checkout branch-with-change
   # Rebase your change onto the latest commits on Github.
-  % git pull --rebase origin master
+  % git pull --rebase origin main
   # Rerun the appropriate tests if needed.
   % ninja check-$whatever
   # Check that the list of commits about to be pushed is correct.
-  % git log origin/master...HEAD --oneline
+  % git log origin/main...HEAD --oneline
   # Push to Github.
-  % git push origin HEAD:master
+  % git push origin HEAD:main
 
 LLVM currently has a linear-history policy, which means that merge commits are
 not allowed. The `llvm-project` repo on github is configured to reject pushes


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D92831.310130.patch
Type: text/x-patch
Size: 3192 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20201208/81095682/attachment-0001.bin>