{"thread":{"id":"35833","subject":"[PATCH 1/4] docs/merge-strategies: remove hyphen from mis-merges","startedAt":"2014-02-08T20:41:34Z","lastAt":"2014-02-11T00:21:36Z","messageCount":7,"participants":["Albert L. Lash, IV","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"234525","messageId":"1391892097-16169-1-git-send-email-alash3@bloomberg.net","threadId":"35833","inReplyTo":null,"subject":"[PATCH 1/4] docs/merge-strategies: remove hyphen from mis-merges","fromName":"Albert L. Lash, IV","fromEmail":"albert.lash@gmail.com","sentAt":"2014-02-08T20:41:34Z","receivedAt":"2014-02-08T20:41:34Z","isPatch":true,"sender":{"key":"albert.lash@gmail.com","avatar":null},"body":"The term mismerges without hyphen is used a few other\nplaces in the documentation. Let's update this to\nbe consistent.\n\nSigned-off-by: Albert L. Lash, IV \n---\n Documentation/merge-strategies.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt\nindex fb6e593..3509498 100644\n--- a/Documentation/merge-strategies.txt\n+++ b/Documentation/merge-strategies.txt\n@@ -20,7 +20,7 @@ recursive::\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-\tcausing mis-merges by tests done on actual merge commits\n+\tcausing mismerges by tests done on actual merge commits\n \ttaken from Linux 2.6 kernel development history.\n \tAdditionally this can detect and handle merges involving\n \trenames. This is the default merge strategy when\n-- \n1.8.3.2\n"},{"id":"234528","messageId":"1391892097-16169-2-git-send-email-alash3@bloomberg.net","threadId":"35833","inReplyTo":"1391892097-16169-1-git-send-email-alash3@bloomberg.net","subject":"[PATCH 2/4] docs/git-remote: capitalize first word of initial blurb","fromName":"Albert L. Lash, IV","fromEmail":"albert.lash@gmail.com","sentAt":"2014-02-08T20:41:35Z","receivedAt":"2014-02-08T20:41:35Z","isPatch":true,"sender":{"key":"albert.lash@gmail.com","avatar":null},"body":"All other man files have capitalized descriptions which\nimmediately follow the command's name. Let's capitalize\nthis one too for consistency.\n\nSigned-off-by: Albert L. Lash, IV \n---\n Documentation/git-remote.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt\nindex 2507c8b..cb103c8 100644\n--- a/Documentation/git-remote.txt\n+++ b/Documentation/git-remote.txt\n@@ -3,7 +3,7 @@ git-remote(1)\n \n NAME\n ----\n-git-remote - manage set of tracked repositories\n+git-remote - Manage set of tracked repositories\n \n \n SYNOPSIS\n-- \n1.8.3.2\n"},{"id":"234526","messageId":"1391892097-16169-3-git-send-email-alash3@bloomberg.net","threadId":"35833","inReplyTo":"1391892097-16169-1-git-send-email-alash3@bloomberg.net","subject":"[PATCH 3/4] docs/git-clone: clarify use of --no-hardlinks option","fromName":"Albert L. Lash, IV","fromEmail":"albert.lash@gmail.com","sentAt":"2014-02-08T20:41:36Z","receivedAt":"2014-02-08T20:41:36Z","isPatch":true,"sender":{"key":"albert.lash@gmail.com","avatar":null},"body":"Current text claims optimization, implying the use of\nhardlinks, when this option ratchets down the level of\nefficiency. This change explains the difference made by\nusing this option, namely copying instead of hardlinking,\nand why it may be useful.\n\nSigned-off-by: Albert L. Lash, IV \n---\n Documentation/git-clone.txt | 11 ++++-------\n 1 file changed, 4 insertions(+), 7 deletions(-)\n\ndiff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\nindex bf3dac0..0363d00 100644\n--- a/Documentation/git-clone.txt\n+++ b/Documentation/git-clone.txt\n@@ -55,15 +55,12 @@ repository is specified as a URL, then this flag is ignored (and we\n never use the local optimizations). Specifying `--no-local` will\n override the default when `/path/to/repo` is given, using the regular\n Git transport instead.\n-+\n-To force copying instead of hardlinking (which may be desirable if you\n-are trying to make a back-up of your repository), but still avoid the\n-usual \"Git aware\" transport mechanism, `--no-hardlinks` can be used.\n \n --no-hardlinks::\n-\tOptimize the cloning process from a repository on a\n-\tlocal filesystem by copying files under `.git/objects`\n-\tdirectory.\n+\tForce the cloning process from a repository on a local\n+\tfilesystem to copy the files under the `.git/objects`\n+\tdirectory instead of using hardlinks. This may be desirable\n+\tif you are trying to make a back-up of your repository.\n \n --shared::\n -s::\n-- \n1.8.3.2\n"},{"id":"234527","messageId":"1391892097-16169-4-git-send-email-alash3@bloomberg.net","threadId":"35833","inReplyTo":"1391892097-16169-1-git-send-email-alash3@bloomberg.net","subject":"[PATCH 4/4] docs/git-blame: explain more clearly the example pickaxe use","fromName":"Albert L. Lash, IV","fromEmail":"albert.lash@gmail.com","sentAt":"2014-02-08T20:41:37Z","receivedAt":"2014-02-08T20:41:37Z","isPatch":true,"sender":{"key":"albert.lash@gmail.com","avatar":null},"body":"We state that the following paragraph mentions the pickaxe\ninterface, but the term pickaxe is not then used. This\nchange clarifies that the example command uses the pickaxe\ninterface and what it is searching for.\n\nSigned-off-by: Albert L. Lash, IV \n---\n Documentation/git-blame.txt | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt\nindex 8e70a61..ddb88d0 100644\n--- a/Documentation/git-blame.txt\n+++ b/Documentation/git-blame.txt\n@@ -35,7 +35,8 @@ Apart from supporting file annotation, Git also supports searching the\n development history for when a code snippet occurred in a change. This makes it\n possible to track when a code snippet was added to a file, moved or copied\n between files, and eventually deleted or replaced. It works by searching for\n-a text string in the diff. A small example:\n+a text string in the diff. A small example of the pickaxe interface \n+that searches for `blame_usage`:\n \n -----------------------------------------------------------------------------\n $ git log --pretty=oneline -S'blame_usage'\n-- \n1.8.3.2\n"},{"id":"234598","messageId":"xmqqy51ir834.fsf@gitster.dls.corp.google.com","threadId":"35833","inReplyTo":"1391892097-16169-1-git-send-email-alash3@bloomberg.net","subject":"Re: [PATCH 1/4] docs/merge-strategies: remove hyphen from mis-merges","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-02-10T21:06:23Z","receivedAt":"2014-02-10T21:06:23Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"},{"id":"234603","messageId":"xmqqmwhyqz3s.fsf@gitster.dls.corp.google.com","threadId":"35833","inReplyTo":"1391892097-16169-3-git-send-email-alash3@bloomberg.net","subject":"Re: [PATCH 3/4] docs/git-clone: clarify use of --no-hardlinks option","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-02-11T00:20:23Z","receivedAt":"2014-02-11T00:20:23Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Albert L. Lash, IV\" writes:\n\n> Current text claims optimization, implying the use of\n> hardlinks, when this option ratchets down the level of\n> efficiency. This change explains the difference made by\n> using this option, namely copying instead of hardlinking,\n> and why it may be useful.\n>\n> Signed-off-by: Albert L. Lash, IV \n> ---\n> Documentation/git-clone.txt | 11 ++++-------\n> 1 file changed, 4 insertions(+), 7 deletions(-)\n>\n> diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\n> index bf3dac0..0363d00 100644\n> --- a/Documentation/git-clone.txt\n> +++ b/Documentation/git-clone.txt\n> @@ -55,15 +55,12 @@ repository is specified as a URL, then this flag is ignored (and we\n> never use the local optimizations). Specifying `--no-local` will\n> override the default when `/path/to/repo` is given, using the regular\n> Git transport instead.\n> -+\n> -To force copying instead of hardlinking (which may be desirable if you\n> -are trying to make a back-up of your repository), but still avoid the\n> -usual \"Git aware\" transport mechanism, `--no-hardlinks` can be used.\n> \n> --no-hardlinks::\n> -\tOptimize the cloning process from a repository on a\n> -\tlocal filesystem by copying files under `.git/objects`\n> -\tdirectory.\n> +\tForce the cloning process from a repository on a local\n> +\tfilesystem to copy the files under the `.git/objects`\n> +\tdirectory instead of using hardlinks. This may be desirable\n> +\tif you are trying to make a back-up of your repository.\n\nMakes sense, and it is kind of embarrassing (I have to suspect that\nthis was originally the description of \"--hardlinks\" option).\n\n[PATCH {1,2}/4] looked trivially correct, too.\n\nThanks.\n"},{"id":"234604","messageId":"xmqqiosmqz1r.fsf@gitster.dls.corp.google.com","threadId":"35833","inReplyTo":"1391892097-16169-4-git-send-email-alash3@bloomberg.net","subject":"Re: [PATCH 4/4] docs/git-blame: explain more clearly the example pickaxe use","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-02-11T00:21:36Z","receivedAt":"2014-02-11T00:21:36Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Albert L. Lash, IV\" writes:\n\n> We state that the following paragraph mentions the pickaxe\n> interface, but the term pickaxe is not then used. This\n> change clarifies that the example command uses the pickaxe\n> interface and what it is searching for.\n>\n> Signed-off-by: Albert L. Lash, IV \n> ---\n> Documentation/git-blame.txt | 3 ++-\n> 1 file changed, 2 insertions(+), 1 deletion(-)\n>\n> diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt\n> index 8e70a61..ddb88d0 100644\n> --- a/Documentation/git-blame.txt\n> +++ b/Documentation/git-blame.txt\n> @@ -35,7 +35,8 @@ Apart from supporting file annotation, Git also supports searching the\n> development history for when a code snippet occurred in a change. This makes it\n> possible to track when a code snippet was added to a file, moved or copied\n> between files, and eventually deleted or replaced. It works by searching for\n> -a text string in the diff. A small example:\n> +a text string in the diff. A small example of the pickaxe interface \n> +that searches for `blame_usage`:\n> \n> -----------------------------------------------------------------------------\n> $ git log --pretty=oneline -S'blame_usage'\n\nThanks.\n\nI cannot shake this nagging feeling that this and the latter half of\nthe previous paragraph may not belong to this page, though.\n\nWill queue.\n"}]}