summaryrefslogtreecommitdiffstats
path: root/Documentation/error-change-closed.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/error-change-closed.txt')
-rw-r--r--Documentation/error-change-closed.txt13
1 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/error-change-closed.txt b/Documentation/error-change-closed.txt
index 7170a65917..97e77084a2 100644
--- a/Documentation/error-change-closed.txt
+++ b/Documentation/error-change-closed.txt
@@ -7,7 +7,7 @@ that is already closed.
This error occurs if you are trying to push a commit that contains
the Change-Id of a closed change in its commit message. A change can
be closed either because it was already submitted and merged or
-because it was abandoned.
+because it was deferred or abandoned.
If the change for which you wanted to upload a new patch set was
already submitted and merged you may want to push your commit as a
@@ -18,11 +18,12 @@ recommendable to do a link:http://www.kernel.org/pub/software/scm/git/docs/git-r
change. Pushing again should now create a new change in Gerrit.
If the change for which you wanted to upload a new patch set was
-abandoned and your new changes overcome the reasons for abandoning
-this change you may want to restore the change in the Gerrit WebUI
-(browse the abandoned change in the Gerrit WebUI and click on the
-'Restore Change' button). Afterwards the push should succeed and a
-new patch set for this change will be created.
+deferred or abandoned and your new changes overcome the reasons for
+deferring/abandoning this change you may want to restore the change
+in the Gerrit WebUI (browse the deferred/abandoned change in the
+Gerrit WebUI and click on the 'Restore Change' button). Afterwards
+the push should succeed and a new patch set for this change will be
+created.
GERRIT