diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-01-17 02:43:10 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-01-17 02:43:10 +0000 |
| commit | 5bd1d59aaa088d93ce9a070bdb715f335892a53c (patch) | |
| tree | 21ce65f8c13f5a2eb8fc720a97ac0406c9cc31e3 /git-merge.txt | |
| parent | 0e47b23874132a7fffde3f56c7c4f13c1f0b8cc4 (diff) | |
| download | git-htmldocs-5bd1d59aaa088d93ce9a070bdb715f335892a53c.tar.gz | |
Autogenerated HTML docs for v1.5.4-rc3-24-gb53139
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/git-merge.txt b/git-merge.txt index ed3a92404..0c9ad7f2b 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -74,14 +74,14 @@ it happens. In other words, `git-diff --cached HEAD` must report no changes. [NOTE] -This is a bit of lie. In certain special cases, your index are -allowed to be different from the tree of `HEAD` commit. The most +This is a bit of a lie. In certain special cases, your index is +allowed to be different from the tree of the `HEAD` commit. The most notable case is when your `HEAD` commit is already ahead of what is being merged, in which case your index can have arbitrary -difference from your `HEAD` commit. Otherwise, your index entries -are allowed have differences from your `HEAD` commit that match -the result of trivial merge (e.g. you received the same patch -from external source to produce the same result as what you are +differences from your `HEAD` commit. Also, your index entries +may have differences from your `HEAD` commit that match +the result of a trivial merge (e.g. you received the same patch +from an external source to produce the same result as what you are merging). For example, if a path did not exist in the common ancestor and your head commit but exists in the tree you are merging into your repository, and if you already happen to have |