{"thread":{"id":"31027","subject":"[PATCH] doc: A few minor copy edits.","startedAt":"2012-07-14T22:20:36Z","lastAt":"2012-07-16T11:46:48Z","messageCount":4,"participants":["Štěpán Němec","Junio C Hamano","Zbigniew Jędrzejewski-Szmek"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"195064","messageId":"1342304436-29499-1-git-send-email-stepnem@gmail.com","threadId":"31027","inReplyTo":null,"subject":"[PATCH] doc: A few minor copy edits.","fromName":"Štěpán Němec","fromEmail":"stepnem@gmail.com","sentAt":"2012-07-14T22:20:36Z","receivedAt":"2012-07-14T22:20:36Z","isPatch":true,"sender":{"key":"stepnem@gmail.com","avatar":"https://avatars.githubusercontent.com/u/106838?v=4"},"body":"- (glossary) the quotes around the Wikipedia URL prevented its\n linkification in frontends that support it; remove them\n\n- (manual) newer version (SHA-1) == following, older == preceding, not\n the other way around\n\n- trivial typo and wording fixes\n\nSigned-off-by: Štěpán Němec \n---\n Documentation/git-merge.txt | 2 +-\n Documentation/git-rebase.txt | 2 +-\n Documentation/glossary-content.txt | 2 +-\n Documentation/rev-list-options.txt | 2 +-\n Documentation/user-manual.txt | 12 ++++++------\n 5 files changed, 10 insertions(+), 10 deletions(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex 3ceefb8..20f9228 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -181,7 +181,7 @@ final result verbatim. When both sides made changes to the same area,\n however, git cannot randomly pick one side over the other, and asks you to\n resolve it by leaving what both sides did to that area.\n \n-By default, git uses the same style as that is used by \"merge\" program\n+By default, git uses the same style as the one used by the \"merge\" program\n from the RCS suite to present such a conflicted hunk, like this:\n \n ------------\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 2d71e4b..2cab7e2 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -273,7 +273,7 @@ which makes little sense.\n \tPass the through to the merge strategy.\n \tThis implies `--merge` and, if no strategy has been\n \tspecified, `-s recursive`. Note the reversal of 'ours' and\n-\t'theirs' as noted in above for the `-m` option.\n+\t'theirs' as noted above for the `-m` option.\n \n -q::\n --quiet::\ndiff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\nindex 3595b58..f928b57 100644\n--- a/Documentation/glossary-content.txt\n+++ b/Documentation/glossary-content.txt\n@@ -117,7 +117,7 @@ to point at the new commit.\n \n [[def_ent]]ent::\n \tFavorite synonym to \"<>\" by some total geeks. See\n-\t`http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth\n+\thttp://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth\n \texplanation. Avoid this term, not to confuse people.\n \n [[def_evil_merge]]evil merge::\ndiff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt\nindex 84e34b1..d9b2b5b 100644\n--- a/Documentation/rev-list-options.txt\n+++ b/Documentation/rev-list-options.txt\n@@ -760,7 +760,7 @@ options may be given. See linkgit:git-diff-files[1] for more options.\n \n --cc::\n \n-\tThis flag implies the '-c' options and further compresses the\n+\tThis flag implies the '-c' option and further compresses the\n \tpatch output by omitting uninteresting hunks whose contents in\n \tthe parents have only two variants and the merge result picks\n \tone of them without modification.\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 02ed566..03d95dc 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -2870,7 +2870,7 @@ $ git fetch example\n You can also add a \"+\" to force the update each time:\n \n -------------------------------------------------\n-$ git config remote.example.fetch +master:ref/remotes/example/master\n+$ git config remote.example.fetch +master:refs/remotes/example/master\n -------------------------------------------------\n \n Don't do this unless you're sure you won't mind \"git fetch\" possibly\n@@ -2966,7 +2966,7 @@ As you can see, a commit is defined by:\n \n - a tree: The SHA-1 name of a tree object (as defined below), representing\n the contents of a directory at a certain point in time.\n-- parent(s): The SHA-1 name of some number of commits which represent the\n+- parent(s): The SHA-1 name(s) of some number of commits which represent the\n immediately previous step(s) in the history of the project. The\n example above has one parent; merge commits may have more than\n one. A commit with no parents is called a \"root\" commit, and\n@@ -3363,8 +3363,8 @@ Date:\n :100644 100644 oldsha... 4b9458b... M somedirectory/myfile\n ------------------------------------------------\n \n-This tells you that the immediately preceding version of the file was\n-\"newsha\", and that the immediately following version was \"oldsha\".\n+This tells you that the immediately following version of the file was\n+\"newsha\", and that the immediately preceding version was \"oldsha\".\n You also know the commit messages that went with the change from oldsha\n to 4b9458b and with the change from 4b9458b to newsha.\n \n@@ -4035,8 +4035,8 @@ $ git ls-files --unmerged\n Each line of the `git ls-files --unmerged` output begins with\n the blob mode bits, blob SHA-1, 'stage number', and the\n filename. The 'stage number' is git's way to say which tree it\n-came from: stage 1 corresponds to `$orig` tree, stage 2 `HEAD`\n-tree, and stage3 `$target` tree.\n+came from: stage 1 corresponds to the `$orig` tree, stage 2 to\n+the `HEAD` tree, and stage 3 to the `$target` tree.\n \n Earlier we said that trivial merges are done inside\n `git read-tree -m`. For example, if the file did not change\n-- \n1.7.10.4\n"},{"id":"195071","messageId":"7vehod614a.fsf@alter.siamese.dyndns.org","threadId":"31027","inReplyTo":"1342304436-29499-1-git-send-email-stepnem@gmail.com","subject":"Re: [PATCH] doc: A few minor copy edits.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-07-15T05:32:05Z","receivedAt":"2012-07-15T05:32:05Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Štěpán Němec writes:\n\n> - (glossary) the quotes around the Wikipedia URL prevented its\n> linkification in frontends that support it; remove them\n>\n> - (manual) newer version (SHA-1) == following, older == preceding, not\n> the other way around\n>\n> - trivial typo and wording fixes\n>\n> Signed-off-by: Štěpán Němec \n\nThanks. All looked reasonable, except that I've heard nobody says\n\"ent\" for the past couple of years, and it might be better to drop\nthe entry altogether.\n\n> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\n> index 3595b58..f928b57 100644\n> --- a/Documentation/glossary-content.txt\n> +++ b/Documentation/glossary-content.txt\n> @@ -117,7 +117,7 @@ to point at the new commit.\n> \n> [[def_ent]]ent::\n> \tFavorite synonym to \"<>\" by some total geeks. See\n> -\t`http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth\n> +\thttp://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth\n> \texplanation. Avoid this term, not to confuse people.\n> \n> [[def_evil_merge]]evil merge::\n"},{"id":"195079","messageId":"87wr25nyve.fsf@gmail.com","threadId":"31027","inReplyTo":"7vehod614a.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] doc: A few minor copy edits.","fromName":"Štěpán Němec","fromEmail":"stepnem@gmail.com","sentAt":"2012-07-15T09:43:17Z","receivedAt":"2012-07-15T09:43:17Z","isPatch":true,"sender":{"key":"stepnem@gmail.com","avatar":"https://avatars.githubusercontent.com/u/106838?v=4"},"body":"On Sat, 14 Jul 2012 22:32:05 -0700\nJunio C. Hamano wrote:\n\n> Thanks. All looked reasonable, except that I've heard nobody says\n> \"ent\" for the past couple of years, and it might be better to drop\n> the entry altogether.\n\nYeah, I have no real opinion here. I've never been a Tolkien fan, so I\nhad no idea what \"ent\" even means, let alone its connection to anything\nGit-related (which is why the glossary entry caught my eye in the first\nplace). I found it amusing and that's all; maybe other Git oldtimers\nhave some kind of personal attachment to it?\n\nI have to admit that I don't remember seeing the word in any of various\nGit-related texts or discussions I've read in past ~3 years, so I agree\nits educative value is probably dubious nowadays. OTOH it's just a\ncouple lines, _and_ amusing... ;-)\n\nI'll resend the patch with the entry removed if no break-through occurs\nduring the next few days.\n\n>> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\n>> index 3595b58..f928b57 100644\n>> --- a/Documentation/glossary-content.txt\n>> +++ b/Documentation/glossary-content.txt\n>> @@ -117,7 +117,7 @@ to point at the new commit.\n>> \n>> [[def_ent]]ent::\n>> \tFavorite synonym to \"<>\" by some total geeks. See\n>> -\t`http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth\n>> +\thttp://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth\n>> \texplanation. Avoid this term, not to confuse people.\n>> \n>> [[def_evil_merge]]evil merge::\n\n-- \nŠtěpán\n"},{"id":"195104","messageId":"5003FF28.50503@in.waw.pl","threadId":"31027","inReplyTo":"87wr25nyve.fsf@gmail.com","subject":"Re: [PATCH] doc: A few minor copy edits.","fromName":"Zbigniew Jędrzejewski-Szmek","fromEmail":"zbyszek@in.waw.pl","sentAt":"2012-07-16T11:46:48Z","receivedAt":"2012-07-16T11:46:48Z","isPatch":true,"sender":{"key":"zbyszek@in.waw.pl","avatar":"https://avatars.githubusercontent.com/u/349618?v=4"},"body":"On 07/15/2012 11:43 AM, Štěpán Němec wrote:\n> On Sat, 14 Jul 2012 22:32:05 -0700\n> Junio C. Hamano wrote:\n> \n>> Thanks. All looked reasonable, except that I've heard nobody says\n>> \"ent\" for the past couple of years, and it might be better to drop\n>> the entry altogether.\nPlease keep it, it's funny.\n\nZbyszek\n"}]}