diff options
| author | Dave Peticolas <dave@krondo.com> | 2008-01-16 05:16:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-16 19:37:57 (GMT) |
| commit | b98525e4bf1c3587bc57ad982d616dbe174c6e23 (patch) | |
| tree | 0f77b06306e0003d83c5b8ec1b8ed71a28e9cd1a | |
| parent | 6232f62bc77ba9fc57fa97c61a7678a9f243c3bd (diff) | |
| download | git-b98525e4bf1c3587bc57ad982d616dbe174c6e23.zip git-b98525e4bf1c3587bc57ad982d616dbe174c6e23.tar.gz git-b98525e4bf1c3587bc57ad982d616dbe174c6e23.tar.bz2 | |
Documentation: fix and clarify grammar in git-merge docs.
Signed-off-by: Dave Peticolas <dave@krondo.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-merge.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index ed3a924..0c9ad7f 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/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 |