{"thread":{"id":"38915","subject":"[PATCH] docs: Clarify \"preserve\" option wording for git-pull","startedAt":"2015-03-26T11:04:23Z","lastAt":"2015-03-26T20:22:27Z","messageCount":4,"participants":["Sebastian Schuberth","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"258542","messageId":"CAHGBnuMcKAhW+_Ho8X1kzZd3B57ogu2Anb1nuPmKwRQD=OYrZQ@mail.gmail.com","threadId":"38915","inReplyTo":null,"subject":"[PATCH] docs: Clarify \"preserve\" option wording for git-pull","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2015-03-26T11:04:23Z","receivedAt":"2015-03-26T11:04:23Z","isPatch":true,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"Before this path, the \"also\" sounded as if \"preserve\" was doing a rebase\nas additional work that \"true\" would not do. Clarify this by saying\n\"still\" instead of \"also\".\n\nSigned-off-by: Sebastian Schuberth <sschuberth@gmail.com>\n---\n Documentation/git-pull.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex d3d236c..96829be 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -111,8 +111,8 @@ include::merge-options.txt[]\n     was rebased since last fetched, the rebase uses that information\n     to avoid rebasing non-local changes.\n +\n-When preserve, also rebase the current branch on top of the upstream\n-branch, but pass `--preserve-merges` along to `git rebase` so that\n+When preserve, still rebase the current branch on top of the upstream\n+branch, but also pass `--preserve-merges` along to `git rebase` so that\n locally created merge commits will not be flattened.\n +\n When false, merge the current branch into the upstream branch.\n-- \n1.9.5.msysgit.1\n"},{"id":"258559","messageId":"xmqqh9t7zmkt.fsf@gitster.dls.corp.google.com","threadId":"38915","inReplyTo":"CAHGBnuMcKAhW+_Ho8X1kzZd3B57ogu2Anb1nuPmKwRQD=OYrZQ@mail.gmail.com","subject":"Re: [PATCH] docs: Clarify \"preserve\" option wording for git-pull","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-03-26T17:37:54Z","receivedAt":"2015-03-26T17:37:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Sebastian Schuberth <sschuberth@gmail.com> writes:\n\n> Before this path, the \"also\" sounded as if \"preserve\" was doing a rebase\n> as additional work that \"true\" would not do. Clarify this by saying\n> \"still\" instead of \"also\".\n\nI agree that the original \"also\" is confusing.  I however wonder if\nwe even want \"still\", though.  For that matter, I doubt if we even\nwant \"also\" in front of \"pass\".  \"When set to preserve, rebase and\npass the extra flag\" sounds as clear as, if not clearer than, \"When\nset to preserve, still rebase and also pass the extra flag\", at\nleast to me.\n\nThanks.\n\n> Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>\n> ---\n>  Documentation/git-pull.txt | 4 ++--\n>  1 file changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\n> index d3d236c..96829be 100644\n> --- a/Documentation/git-pull.txt\n> +++ b/Documentation/git-pull.txt\n> @@ -111,8 +111,8 @@ include::merge-options.txt[]\n>      was rebased since last fetched, the rebase uses that information\n>      to avoid rebasing non-local changes.\n>  +\n> -When preserve, also rebase the current branch on top of the upstream\n> -branch, but pass `--preserve-merges` along to `git rebase` so that\n> +When preserve, still rebase the current branch on top of the upstream\n> +branch, but also pass `--preserve-merges` along to `git rebase` so that\n>  locally created merge commits will not be flattened.\n>  +\n>  When false, merge the current branch into the upstream branch.\n"},{"id":"258563","messageId":"551467E9.8080409@gmail.com","threadId":"38915","inReplyTo":"xmqqh9t7zmkt.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH] docs: Clarify \"preserve\" option wording for git-pull","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2015-03-26T20:11:21Z","receivedAt":"2015-03-26T20:11:21Z","isPatch":true,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"Before this path, the \"also\" sounded as if \"preserve\" was doing a rebase\nas additional work that \"true\" would not do. Clarify this by omitting the\n\"also\" and rewording the sentence a bit.\n\nSigned-off-by: Sebastian Schuberth <sschuberth@gmail.com>\n---\n Documentation/git-pull.txt | 5 ++---\n 1 file changed, 2 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex d3d236c..712ab4b 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -111,9 +111,8 @@ include::merge-options.txt[]\n \twas rebased since last fetched, the rebase uses that information\n \tto avoid rebasing non-local changes.\n +\n-When preserve, also rebase the current branch on top of the upstream\n-branch, but pass `--preserve-merges` along to `git rebase` so that\n-locally created merge commits will not be flattened.\n+When set to preserve, rebase with the `--preserve-merges` option passed\n+to `git rebase` so that locally created merge commits will not be flattened.\n +\n When false, merge the current branch into the upstream branch.\n +\n-- \n1.9.5.msysgit.1\n"},{"id":"258564","messageId":"xmqqsicry0e4.fsf@gitster.dls.corp.google.com","threadId":"38915","inReplyTo":"551467E9.8080409@gmail.com","subject":"Re: [PATCH] docs: Clarify \"preserve\" option wording for git-pull","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-03-26T20:22:27Z","receivedAt":"2015-03-26T20:22:27Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks; this time I do not see whitespace breakages ;-)\n\nWill queue with a minimum tweak of the log message.\n"}]}