diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-01-26 16:20:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-26 16:20:38 -0800 |
| commit | 289d7e8e148e955d97776feff1a43a249eda86a6 (patch) | |
| tree | 1af6dc01f658cd7e6c8683caff506fd98b3c2908 /git-pull.txt | |
| parent | 4e6ba27c956c6c9b43e7196f210796bd1db478a9 (diff) | |
| download | git-htmldocs-289d7e8e148e955d97776feff1a43a249eda86a6.tar.gz | |
Autogenerated HTML docs for v2.7.0-193-gd10e2
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-pull.txt b/git-pull.txt index 93c72a29c..a62a2a615 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -101,7 +101,7 @@ Options related to merging include::merge-options.txt[] -r:: ---rebase[=false|true|preserve]:: +--rebase[=false|true|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 @@ -113,6 +113,8 @@ to `git rebase` so that locally created merge commits will not be flattened. + When false, merge the current branch into the upstream branch. + +When `interactive`, enable the interactive mode of rebase. ++ See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging. |