diff options
| author |  Sebastian Schuberth <sschuberth@gmail.com> | 2015-03-26 21:11:21 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-03-26 13:19:26 -0700 |
| commit | 129260cbd42f2a9fb40055ac6ed32c7b75a5ec05 (patch) | |
| tree | c97d5608d487c38d64bc9b9ad9c5b46665f21504 /t/t3507-cherry-pick-conflict.sh | |
| parent | Merge branch 'maint-1.9' into maint-2.0 (diff) | |
| download | tgif-129260cbd42f2a9fb40055ac6ed32c7b75a5ec05.tar.xz | |
docs: clarify "preserve" option wording for git-pull
The "also" sounds as if "preserve" does a rebase as an additional
step that "true" would not do, but that is not the case. Clarify
this by omitting "also", and rewording the sentence a bit.
Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions