diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-28 11:18:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-28 11:18:17 -0700 |
| commit | ba423bd93b68f09cbd4f3d368517c8cb865f9b1b (patch) | |
| tree | ae22449a4460717ba757f4007676d970a7820e82 /git-pull.txt | |
| parent | 9e17c57b766e5f01e973ad6b523bf5c2c66f968e (diff) | |
| download | git-htmldocs-ba423bd93b68f09cbd4f3d368517c8cb865f9b1b.tar.gz | |
Autogenerated HTML docs for v2.4.0-rc0-37-ga3b75
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/git-pull.txt b/git-pull.txt index d3d236cd1..712ab4bae 100644 --- a/git-pull.txt +++ b/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. + |