diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-03-04 12:06:24 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-03-04 12:06:24 +0000 |
| commit | 3b022a5d9210de39138db2d53b13d6da2c8f364f (patch) | |
| tree | 11f00822e8110c12d963c1a661735b22b42e6535 /git-merge.txt | |
| parent | 8e2258803108102bf85f2b7bbace5ce208c99249 (diff) | |
| download | git-htmldocs-3b022a5d9210de39138db2d53b13d6da2c8f364f.tar.gz | |
Autogenerated HTML docs for v1.5.4.3-447-gc95b3
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index 0c9ad7f2b..c136b1069 100644 --- a/git-merge.txt +++ b/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. |