[PATCH] Fix incorrect wording in git-merge.txt.
From: Matthieu Moy <hidden>
Date: 2016-06-15 22:44:19
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
A merge is not necessarily with a remote branch, it can be with any commit object. --- Documentation/git-merge.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 0c9ad7f..193c9c0 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt@@ -68,7 +68,8 @@ HOW MERGE WORKS --------------- A merge is always between the current `HEAD` and one or more -remote branch heads, and the index file must exactly match the +commit objects (usually, branch head or tag), and the index file must +exactly match the tree of `HEAD` commit (i.e. the contents of the last commit) when it happens. In other words, `git-diff --cached HEAD` must report no changes.
--
1.5.4.21.g82c44