diff --git a/llvm/docs/Phabricator.rst b/llvm/docs/Phabricator.rst --- a/llvm/docs/Phabricator.rst +++ b/llvm/docs/Phabricator.rst @@ -200,14 +200,27 @@ commit message derived from information in the Phabricator review. 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. +For example, ensure that: + +* the ``Author`` property of the commit is set to the original author. +* all phabricator tags except ``Differential Revision`` are stripped + from commit message. + 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 + +Otherwise you can clean commit message as: + +:: + + git commit --amend + + +Then, make sure the commit is up-to-date, and push it. This can be done by running the following: :: @@ -217,12 +230,10 @@ ninja check-$whatever # Rerun the appropriate tests if needed. git push -Or - -:: - - arc land D +Avoid using `arc land` as it keeps redundant tags in the commit message. +Redundant tag examples are ``Summary``, ``Reviewers``, ``Subscribers``, +``Tags``. Abandoning a change -------------------