From: Jinsong Ji Date: Thu, 26 Mar 2020 18:05:34 +0000 (+0000) Subject: [docs][Phabricator] git migration related update X-Git-Tag: llvmorg-12-init~11015 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe025a34902b3dff5e98588f0fdee7023274731a;p=platform%2Fupstream%2Fllvm.git [docs][Phabricator] git migration related update 1.Add instructions to update author when committing other's patch We have updated DeveloperPolicy to show how to change author in https://reviews.llvm.org/D72468 We should also update Phabricator page to include such infomation, in case people follow the steps here and forget to update author info. 2. Replace `git llvm push` with `git push` Reviewed By: probinson Differential Revision: https://reviews.llvm.org/D76718 --- diff --git a/llvm/docs/Phabricator.rst b/llvm/docs/Phabricator.rst index 9f35af9..bd843d4 100644 --- a/llvm/docs/Phabricator.rst +++ b/llvm/docs/Phabricator.rst @@ -169,7 +169,7 @@ yourself. Using the Arcanist tool can simplify the process of committing reviewed code as it will retrieve reviewers, the ``Differential Revision``, etc from the review and place it in the commit message. You may also commit an accepted change -directly using ``git llvm push``, per the section in the :ref:`getting started +directly using ``git push``, per the section in the :ref:`getting started guide `. Note that if you commit the change without using Arcanist and forget to add the @@ -194,8 +194,15 @@ This will create a new branch called ``arcpatch-D`` based on the current ``master`` and will create a commit corresponding to ``D`` with a commit message derived from information in the Phabricator review. -Check you are happy with the commit message and amend it if necessary. Then, -make sure the commit is up-to-date, and commit it. This can be done by running +Check you are happy with the commit message and amend it if necessary. +For example, ensure the 'Author' property of the commit is set to the original author. +You can use a command to correct the author property if it is incorrect: + +:: + + git commit --amend --author="John Doe " + +Then, make sure the commit is up-to-date, and commit it. This can be done by running the following: :: @@ -203,7 +210,7 @@ the following: git pull --rebase origin master git show # Ensure the patch looks correct. ninja check-$whatever # Rerun the appropriate tests if needed. - git llvm push + git push Or