[PATCH] docs: Clarify preserve option wording for git-pull
Before this path, the also sounded as if preserve was doing a rebase as additional work that true would not do. Clarify this by saying still instead of also. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- Documentation/git-pull.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index d3d236c..96829be 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -111,8 +111,8 @@ include::merge-options.txt[] was rebased since last fetched, the rebase uses that information to avoid rebasing non-local changes. + -When preserve, also rebase the current branch on top of the upstream -branch, but pass `--preserve-merges` along to `git rebase` so that +When preserve, still rebase the current branch on top of the upstream +branch, but also pass `--preserve-merges` along to `git rebase` so that locally created merge commits will not be flattened. + When false, merge the current branch into the upstream branch. -- 1.9.5.msysgit.1 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] docs: Clarify preserve option wording for git-pull
Sebastian Schuberth sschube...@gmail.com writes: Before this path, the also sounded as if preserve was doing a rebase as additional work that true would not do. Clarify this by saying still instead of also. I agree that the original also is confusing. I however wonder if we even want still, though. For that matter, I doubt if we even want also in front of pass. When set to preserve, rebase and pass the extra flag sounds as clear as, if not clearer than, When set to preserve, still rebase and also pass the extra flag, at least to me. Thanks. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- Documentation/git-pull.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index d3d236c..96829be 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -111,8 +111,8 @@ include::merge-options.txt[] was rebased since last fetched, the rebase uses that information to avoid rebasing non-local changes. + -When preserve, also rebase the current branch on top of the upstream -branch, but pass `--preserve-merges` along to `git rebase` so that +When preserve, still rebase the current branch on top of the upstream +branch, but also pass `--preserve-merges` along to `git rebase` so that locally created merge commits will not be flattened. + When false, merge the current branch into the upstream branch. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] docs: Clarify preserve option wording for git-pull
Thanks; this time I do not see whitespace breakages ;-) Will queue with a minimum tweak of the log message. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] docs: Clarify preserve option wording for git-pull
Before this path, the also sounded as if preserve was doing a rebase as additional work that true would not do. Clarify this by omitting the also and rewording the sentence a bit. Signed-off-by: Sebastian Schuberth sschube...@gmail.com --- Documentation/git-pull.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index d3d236c..712ab4b 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -111,9 +111,8 @@ include::merge-options.txt[] was rebased since last fetched, the rebase uses that information to avoid rebasing non-local changes. + -When preserve, also rebase the current branch on top of the upstream -branch, but pass `--preserve-merges` along to `git rebase` so that -locally created merge commits will not be flattened. +When set to preserve, rebase with the `--preserve-merges` option passed +to `git rebase` so that locally created merge commits will not be flattened. + When false, merge the current branch into the upstream branch. + -- 1.9.5.msysgit.1 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
