{"thread":{"id":"17013","subject":"[PATCH] Documentation/merge-strategies.txt, diff-options: grammar","startedAt":"2009-01-06T03:52:36Z","lastAt":"2009-01-06T09:38:42Z","messageCount":3,"participants":["jidanni@jidanni.org","Thomas Rast","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"99416","messageId":"1231213956-14929-1-git-send-email-jidanni@jidanni.org","threadId":"17013","inReplyTo":null,"subject":"[PATCH] Documentation/merge-strategies.txt, diff-options: grammar","fromName":"","fromEmail":"jidanni@jidanni.org","sentAt":"2009-01-06T03:52:36Z","receivedAt":"2009-01-06T03:52:36Z","isPatch":true,"sender":{"key":"jidanni@jidanni.org","avatar":"https://gravatar.com/avatar/36568d4af4c8d3e71627ef3b8c8d00e39065b12f29676cccd38ced75e68fa2a6?d=mp&s=160"},"body":"Signed-off-by: jidanni <jidanni@jidanni.org>\n---\n Documentation/diff-options.txt     |    4 ++--\n Documentation/merge-strategies.txt |    2 +-\n 2 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\nindex b432d25..9cd162f 100644\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -143,11 +143,11 @@ endif::git-format-patch[]\n \tthat matches other criteria, nothing is selected.\n \n --find-copies-harder::\n-\tFor performance reasons, by default, `-C` option finds copies only\n+\tFor performance reasons, by default, the `-C` option finds copies only\n \tif the original file of the copy was modified in the same\n \tchangeset.  This flag makes the command\n \tinspect unmodified files as candidates for the source of\n-\tcopy.  This is a very expensive operation for large\n+\tthe copy.  This is a very expensive operation for large\n \tprojects, so use it with caution.  Giving more than one\n \t`-C` option has the same effect.\n \ndiff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt\nindex 1276f85..3cef90a 100644\n--- a/Documentation/merge-strategies.txt\n+++ b/Documentation/merge-strategies.txt\n@@ -11,7 +11,7 @@ resolve::\n recursive::\n \tThis can only resolve two heads using 3-way merge\n \talgorithm.  When there are more than one common\n-\tancestors that can be used for 3-way merge, it creates a\n+\tancestor that can be used for 3-way merge, it creates a\n \tmerged tree of the common ancestors and uses that as\n \tthe reference tree for the 3-way merge.  This has been\n \treported to result in fewer merge conflicts without\n-- \n1.6.0.6\n"},{"id":"99447","messageId":"200901060944.09435.trast@student.ethz.ch","threadId":"17013","inReplyTo":"1231213956-14929-1-git-send-email-jidanni@jidanni.org","subject":"Re: [PATCH] Documentation/merge-strategies.txt, diff-options: grammar","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2009-01-06T08:44:06Z","receivedAt":"2009-01-06T08:44:06Z","isPatch":true,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"jidanni@jidanni.org wrote:\n> @@ -11,7 +11,7 @@ resolve::\n>  recursive::\n>  \tThis can only resolve two heads using 3-way merge\n>  \talgorithm.  When there are more than one common\n> -\tancestors that can be used for 3-way merge, it creates a\n> +\tancestor that can be used for 3-way merge, it creates a\n>  \tmerged tree of the common ancestors and uses that as\n>  \tthe reference tree for the 3-way merge.  This has been\n>  \treported to result in fewer merge conflicts without\n\nI'm not a native speaker, but shouldn't this be worded\n\n  When there _is_ more than one common _ancestor_ that ...\n\ninstead?\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n\n"},{"id":"99456","messageId":"20090106093842.GA10697@coredump.intra.peff.net","threadId":"17013","inReplyTo":"200901060944.09435.trast@student.ethz.ch","subject":"Re: [PATCH] Documentation/merge-strategies.txt, diff-options: grammar","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-01-06T09:38:42Z","receivedAt":"2009-01-06T09:38:42Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Jan 06, 2009 at 09:44:06AM +0100, Thomas Rast wrote:\n\n> jidanni@jidanni.org wrote:\n> > @@ -11,7 +11,7 @@ resolve::\n> >  recursive::\n> >  \tThis can only resolve two heads using 3-way merge\n> >  \talgorithm.  When there are more than one common\n> > -\tancestors that can be used for 3-way merge, it creates a\n> > +\tancestor that can be used for 3-way merge, it creates a\n> >  \tmerged tree of the common ancestors and uses that as\n> >  \tthe reference tree for the 3-way merge.  This has been\n> >  \treported to result in fewer merge conflicts without\n> \n> I'm not a native speaker, but shouldn't this be worded\n> \n>   When there _is_ more than one common _ancestor_ that ...\n> \n> instead?\n\nI am, and yes.\n\n-Peff\n"}]}