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

2015-03-26 Thread Junio C Hamano
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

2015-03-26 Thread Sebastian Schuberth
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 --- Documentation/git-pull.txt | 5 ++--- 1 file changed, 2 insertions(+)

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

2015-03-26 Thread Junio C Hamano
Sebastian Schuberth 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", thou

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

2015-03-26 Thread Sebastian Schuberth
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 --- Documentation/git-pull.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) dif