Merge "User upload documentation: Replace changes"

This commit is contained in:
Martin Fick
2012-03-07 10:57:58 -08:00
committed by gerrit code review

View File

@@ -342,17 +342,17 @@ Replace Changes
~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~
To replace changes, ensure Change-Id lines were created in the To replace changes, ensure Change-Id lines were created in the
commit messages, and just use `repo upload` without the `--replace` commit messages, and just use `repo upload`.
command line flag. Gerrit Code Review will automatically match Gerrit Code Review will automatically match the commits back to
the commits back to their original changes by taking advantage of their original changes by taking advantage of their Change-Id lines.
their Change-Id lines.
If Change-Id lines are not present in the commit messages, consider If Change-Id lines are not present in the commit messages, consider
amending the message and copying the line from the change's page amending the message and copying the line from the change's page
on the web. on the web.
If Change-Id lines are not available, then the user must use the much If Change-Id lines are not available, then the user must use the much
more manual mapping technique offered by `repo upload --replace`. more <<manual_replacement_mapping,manual mapping technique>> offered
by using `git push` to a specific `refs/changes/change#` reference.
For more about Change-Ids, see link:user-changeid.html[Change-Id Lines]. For more about Change-Ids, see link:user-changeid.html[Change-Id Lines].