Merge branch 'ss/pull-rebase-preserve'

gitster · gitster · commit 3a183520b2f5 · 2015-03-28T09:37:52.000-07:00
* ss/pull-rebase-preserve:
  docs: clarify "preserve" option wording for git-pull
diff --git 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.
 +

Original file line number	Diff line number	Diff line change
`@@ -111,9 +111,8 @@ include::merge-options.txt[]`
`111`	`111`	`was rebased since last fetched, the rebase uses that information`
`112`	`112`	`to avoid rebasing non-local changes.`
`113`	`113`	`+`
`114`		`-When preserve, also rebase the current branch on top of the upstream`
`115`		-branch, but pass `--preserve-merges` along to `git rebase` so that
`116`		`-locally created merge commits will not be flattened.`
	`114`	+When set to preserve, rebase with the `--preserve-merges` option passed
	`115`	+to `git rebase` so that locally created merge commits will not be flattened.
`117`	`116`	`+`
`118`	`117`	`When false, merge the current branch into the upstream branch.`
`119`	`118`	`+`