{"thread":{"id":"11653","subject":"[PATCH] Documentation: fix and clarify grammar in git-merge docs.","startedAt":"2008-01-17T02:58:39Z","lastAt":"2008-01-17T02:58:39Z","messageCount":1,"participants":["dave@krondo.com"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"65675","messageId":"1200538719-24733-1-git-send-email-dave@krondo.com","threadId":"11653","inReplyTo":null,"subject":"[PATCH] Documentation: fix and clarify grammar in git-merge docs.","fromName":"","fromEmail":"dave@krondo.com","sentAt":"2008-01-17T02:58:39Z","receivedAt":"2008-01-17T02:58:39Z","isPatch":true,"sender":{"key":"dave@krondo.com","avatar":null},"body":"From: Dave Peticolas <dave@krondo.com>\n\n---\n Documentation/git-merge.txt |   12 ++++++------\n 1 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex ed3a924..4494595 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -74,14 +74,14 @@ it happens.  In other words, `git-diff --cached HEAD` must\n report no changes.\n \n [NOTE]\n-This is a bit of lie.  In certain special cases, your index are\n-allowed to be different from the tree of `HEAD` commit.  The most\n+This is a bit of a lie.  In certain special cases, your index is\n+allowed to be different from the tree of the `HEAD` commit.  The most\n notable case is when your `HEAD` commit is already ahead of what\n is being merged, in which case your index can have arbitrary\n-difference from your `HEAD` commit.  Otherwise, your index entries\n-are allowed have differences from your `HEAD` commit that match\n-the result of trivial merge (e.g. you received the same patch\n-from external source to produce the same result as what you are\n+differences from your `HEAD` commit.  Also, your index entries\n+may have differences from your `HEAD` commit that match\n+the result of a trivial merge (e.g., you received the same patch\n+from an external source to produce the same result as what you are\n merging).  For example, if a path did not exist in the common\n ancestor and your head commit but exists in the tree you are\n merging into your repository, and if you already happen to have\n-- \n1.5.3.8\n"}]}