{"thread":{"id":"11639","subject":"[PATCH] Documentation: fix and clarify grammar in git-merge docs.","startedAt":"2008-01-16T05:16:05Z","lastAt":"2008-01-16T19:07:29Z","messageCount":2,"participants":["dave@krondo.com","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"65492","messageId":"1200460565-16797-1-git-send-email-dave@krondo.com","threadId":"11639","inReplyTo":null,"subject":"[PATCH] Documentation: fix and clarify grammar in git-merge docs.","fromName":"","fromEmail":"dave@krondo.com","sentAt":"2008-01-16T05:16:05Z","receivedAt":"2008-01-16T05:16:05Z","isPatch":true,"sender":{"key":"dave@krondo.com","avatar":null},"body":"From: Dave Peticolas <dave@krondo.com>\n\n\nSigned-off-by: Dave Peticolas <dave@krondo.com>\n---\n Documentation/git-merge.txt |   25 ++++++++++++-------------\n 1 files changed, 12 insertions(+), 13 deletions(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex ed3a924..abf63fe 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -74,19 +74,18 @@ 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-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-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-that path exactly in your index, the merge does not have to\n-fail.\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\n+most notable case is when your `HEAD` commit is already ahead of\n+what is being merged, in which case your index can have arbitrary\n+differences from your `HEAD` commit.  Also, your index entries may\n+have differences from your `HEAD` commit that match the result of\n+a trivial merge (e.g., you received the same patch from an external\n+source to produce the same result as what you are merging).  For example,\n+if a path did not exist in the common ancestor and your head commit\n+but exists in the tree you are merging into your repository, and if\n+you already happen to have that path exactly in your index, the merge\n+does not have to fail.\n \n Otherwise, merge will refuse to do any harm to your repository\n (that is, it may fetch the objects from remote, and it may even\n-- \n1.5.3.8\n"},{"id":"65581","messageId":"7vd4s1r3m6.fsf@gitster.siamese.dyndns.org","threadId":"11639","inReplyTo":"1200460565-16797-1-git-send-email-dave@krondo.com","subject":"Re: [PATCH] Documentation: fix and clarify grammar in git-merge docs.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-01-16T19:07:29Z","receivedAt":"2008-01-16T19:07:29Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"dave@krondo.com writes:\n\n> From: Dave Peticolas <dave@krondo.com>\n>\n>\n> Signed-off-by: Dave Peticolas <dave@krondo.com>\n> ---\n>  Documentation/git-merge.txt |   25 ++++++++++++-------------\n>  1 files changed, 12 insertions(+), 13 deletions(-)\n>\n> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\n> index ed3a924..abf63fe 100644\n> --- a/Documentation/git-merge.txt\n> +++ b/Documentation/git-merge.txt\n> @@ -74,19 +74,18 @@ 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> -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> -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> -that path exactly in your index, the merge does not have to\n> -fail.\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\n> +most notable case is when your `HEAD` commit is already ahead of\n> +what is being merged, in which case your index can have arbitrary\n> +differences from your `HEAD` commit.  Also, your index entries may\n> +have differences from your `HEAD` commit that match the result of\n> +a trivial merge (e.g., you received the same patch from an external\n> +source to produce the same result as what you are merging).  For example,\n> +if a path did not exist in the common ancestor and your head commit\n> +but exists in the tree you are merging into your repository, and if\n> +you already happen to have that path exactly in your index, the merge\n> +does not have to fail.\n\nWhile checking and fixing the grammatical errors is very much\nappreciated, line re-wrapping is not.  It makes it unnecessarily\ncumbersome to see what got really changed.\n\nThanks anyway.  The changes look good.\n"}]}