diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 16:07:42 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 16:07:42 +0900 |
| commit | b9d9d90d180cf21baeeb16bd89828d25c7901470 (patch) | |
| tree | a40241052af8d4f5543b66581e3f0235cfae0af3 /git-pull.txt | |
| parent | ccb8252b46bfba5daf0cfcedaf0f9d2e14ba356f (diff) | |
| download | git-htmldocs-b9d9d90d180cf21baeeb16bd89828d25c7901470.tar.gz | |
Autogenerated HTML docs for v2.17.0-775-ge144d
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git-pull.txt b/git-pull.txt index ce05b7a5b..4e0ad6fd8 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -101,13 +101,17 @@ Options related to merging include::merge-options.txt[] -r:: ---rebase[=false|true|preserve|interactive]:: +--rebase[=false|true|merges|preserve|interactive]:: When true, rebase the current branch on top of the upstream branch after fetching. If there is a remote-tracking branch corresponding to the upstream branch and the upstream branch was rebased since last fetched, the rebase uses that information to avoid rebasing non-local changes. + +When set to `merges`, rebase using `git rebase --rebase-merges` so that +the local merge commits are included in the rebase (see +linkgit:git-rebase[1] for details). ++ When set to preserve, rebase with the `--preserve-merges` option passed to `git rebase` so that locally created merge commits will not be flattened. + |