[PATCH] docs: Clarify "preserve" option wording for git-pull

From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Mar 26, 2015, 11:04 UTC
Message-ID: <CAHGBnuMcKAhW+_Ho8X1kzZd3B57ogu2Anb1nuPmKwRQD=OYrZQ@mail.gmail.com>

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 <sschuberth@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