diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-30 11:17:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-30 11:17:47 -0700 |
| commit | c01eecf936b3fc58968e889f0c1e7ab7340df593 (patch) | |
| tree | dcf6c9920dfcc4ba892021391755631a78fefcb7 /git-pull.txt | |
| parent | 56d696ee5be4d6ce871726df6e396c76eedcccf0 (diff) | |
| download | git-htmldocs-c01eecf936b3fc58968e889f0c1e7ab7340df593.tar.gz | |
Autogenerated HTML docs for v2.22.0-rc2
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-pull.txt b/git-pull.txt index 118d9d86f..a5e9501a0 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -112,8 +112,9 @@ 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. +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 current branch into the upstream branch. + |