diff --git a/llvm/docs/Phabricator.rst b/llvm/docs/Phabricator.rst --- a/llvm/docs/Phabricator.rst +++ b/llvm/docs/Phabricator.rst @@ -169,7 +169,7 @@ 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 @@ 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 @@ 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