Skip to content

Commit

Permalink
Add section on amended commits.
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Cote committed Aug 22, 2017
1 parent a0ec992 commit b86b825
Showing 1 changed file with 24 additions and 0 deletions.
24 changes: 24 additions & 0 deletions phabricator-user.rst
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ two common use cases: "fix-up commits", which is somewhat similar to
GitHub's process, and amended commits, which is similar to MozReview's
model.

.. _initial-patch:

The Initial Patch
-----------------

Expand Down Expand Up @@ -233,6 +235,28 @@ Phabricator language):
:align: center
:alt: Screenshot of changes between Diff 1 and Diff 2

Amended Commits
---------------

The other method for updating patches is to amend the commits in
place. This is similar to MozReview's standard process.

Starting from the end of the above section, :ref:`initial-patch`,
rather than creating a new commit, we amend the existing commit, like
so::

$ echo "Update" >> PHABTEST
$ hg commit --amend

After running ``arc diff``, an editor is again opened for a change
summary, although this time there is no new commit message to use, so
we must enter one manually. Once the update is processed, the
revision looks very similar to the revision with fix-up commits,
except the "Commits" tab of the "Revision Contents" table has only a
single entry. The "History" tab, however, is identical to the fix-up
commits scenario, with "Diff 1" and "Diff 2" entries, and the same
ability to see the different patches and differences between them.

****************
Our Installation
****************
Expand Down

0 comments on commit b86b825

Please sign in to comment.