diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-18 17:02:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-18 17:02:08 -0700 |
| commit | 59646279943e7720dcd1ffef1d24ce9e101c39f4 (patch) | |
| tree | d04a140f5d2291dd891733f54242b2e5c679175f /git-pull.txt | |
| parent | 7b1585b6902973456b47ee9acd8a01365e52a4df (diff) | |
| download | git-htmldocs-59646279943e7720dcd1ffef1d24ce9e101c39f4.tar.gz | |
Autogenerated HTML docs for v2.33.1-711-g9d530
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/git-pull.txt b/git-pull.txt index aef757ec8..0e14f8b5b 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -105,7 +105,7 @@ Options related to merging include::merge-options.txt[] -r:: ---rebase[=false|true|merges|preserve|interactive]:: +--rebase[=false|true|merges|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 @@ -116,10 +116,6 @@ 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` (deprecated in favor of `merges`), rebase with the -`--preserve-merges` option passed to `git rebase` so that locally created -merge commits will not be flattened. -+ When false, merge the upstream branch into the current branch. + When `interactive`, enable the interactive mode of rebase. |