summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-04 08:34:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-04 08:34:39 (GMT)
commit27b4070e40a771c41ed581ef1ac98dd43e58ab87 (patch)
tree084c3b9f77e5d9e8253a16e6f9baea5d25f77e46 /Documentation
parent4947cf9cc377b15006f3e649c59edf9bc813af6f (diff)
parent52dce39762fbec75b2d561e5dedb25b8e51f83eb (diff)
downloadgit-27b4070e40a771c41ed581ef1ac98dd43e58ab87.zip
git-27b4070e40a771c41ed581ef1ac98dd43e58ab87.tar.gz
git-27b4070e40a771c41ed581ef1ac98dd43e58ab87.tar.bz2
Merge branch 'maint'
* maint: Fix 'git remote show' regression on empty repository in 1.5.4 Fix incorrect wording in git-merge.txt. git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options Fix random crashes in http_cleanup()
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-merge.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 0c9ad7f..c136b10 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
+commits (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.