Merge "Added explanation for "One or more refs/for/ ..." error"
diff --git a/Documentation/error-change-not-found.txt b/Documentation/error-change-not-found.txt
new file mode 100644
index 0000000..c9ac0d8
--- /dev/null
+++ b/Documentation/error-change-not-found.txt
@@ -0,0 +1,15 @@
+change ... not found
+====================
+
+With this error message Gerrit rejects to push a commit to a change
+that cannot be found.
+
+This error message means that the user explicitly pushed a commit to
+a non-existing change by specifying it as target ref. This way of
+adding a new patch set to a change is deprecated as explained link:user-upload.html#manual_replacement_mapping[here].
+It is recommended to only rely on Change-ID's for link:user-upload.html#push_replace[replacing changes].
+
+
+GERRIT
+------
+Part of link:error-messages.html[Gerrit Error Messages]
diff --git a/Documentation/error-messages.txt b/Documentation/error-messages.txt
index 6091af3..31a6813 100644
--- a/Documentation/error-messages.txt
+++ b/Documentation/error-messages.txt
@@ -11,9 +11,11 @@
* link:error-branch-not-found.html[branch ... not found]
* link:error-change-closed.html[change ... closed]
+* link:error-change-not-found.html[change ... not found]
* link:error-invalid-changeid.html[invalid Change-Id line format in commit message]
* link:error-missing-changeid.html[missing Change-Id in commit message]
* link:error-multiple-changeid-lines.html[multiple Change-Id lines in commit message]
+* link:error-no-common-ancestry.html[no common ancestry]
* link:error-no-new-changes.html[no new changes]
* link:error-not-a-gerrit-project.html[not a Gerrit project]
* link:error-not-valid-ref.html[not valid ref]
diff --git a/Documentation/error-no-common-ancestry.txt b/Documentation/error-no-common-ancestry.txt
new file mode 100644
index 0000000..615da71
--- /dev/null
+++ b/Documentation/error-no-common-ancestry.txt
@@ -0,0 +1,20 @@
+no common ancestry
+==================
+
+With this error message Gerrit rejects to push a commit for code
+review if the pushed commit and the commit at the tip of the target
+branch do not have a common ancestry.
+
+This means that your local development history and the development
+history of the branch to which the push is done are completely
+independent (they have completely independent commit graphs).
+
+This error usually occurs if you do a change in one project and then
+you accidentally push the commit to another project for code review.
+To fix the problem you should check your push specification and
+verify that you are pushing the commit to the correct project.
+
+
+GERRIT
+------
+Part of link:error-messages.html[Gerrit Error Messages]
diff --git a/Documentation/user-upload.txt b/Documentation/user-upload.txt
index 10fddd3..4a137e4 100644
--- a/Documentation/user-upload.txt
+++ b/Documentation/user-upload.txt
@@ -191,6 +191,7 @@
For more about Change-Ids, see link:user-changeid.html[Change-Id Lines].
+[[manual_replacement_mapping]]
Manual Replacment Mapping
^^^^^^^^^^^^^^^^^^^^^^^^^
