From 905cb4e79ff0a3e3b80f1598fa42b397a03d37db Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 26 Jan 2018 08:49:52 +0900 Subject: [PATCH] Clarify documentation of "no new changes" error message Update the documentation to clarify that it is necessary to replace the Change-Id when re-pushing a commit to the same destination branch. Previously the documentation also implied that this was necessary when pushing to a different branch. Bug: Issue 8222 Change-Id: I4a7f87322c7117f34d2ea3a8be8eec4b38fa406a --- Documentation/error-no-new-changes.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Documentation/error-no-new-changes.txt b/Documentation/error-no-new-changes.txt index a5c805cd74..17422add03 100644 --- a/Documentation/error-no-new-changes.txt +++ b/Documentation/error-no-new-changes.txt @@ -40,10 +40,11 @@ means: If you need to re-push a commit you may rewrite this commit by link:http://www.kernel.org/pub/software/scm/git/docs/git-commit.html[amending] it or doing an interactive link:http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html[git rebase]. By rewriting the commit you actually create a new commit (with a new commit ID in -project scope) which can then be pushed to Gerrit. If the old commit -contains a Change-Id in the commit message you also need to replace -it with a new Change-Id (case 1. and 3. above), otherwise the push -will fail with another error message. +project scope) which can then be pushed to Gerrit. + +If you are pushing the new change to the same destination branch as +the old commit (case 1 above), you also need to replace it with a new +Change-Id, otherwise the push will fail with another error message. == Fast-forward merges