diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-11 15:57:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-11 15:57:50 -0700 |
| commit | cf4a17477022e58e1394a8ae62a80c9e40ff0ef5 (patch) | |
| tree | 5b8a5059179951cb28381f15f722ef1b2515d7c5 /git-pull.txt | |
| parent | 8eac268d5824abada1efa8990ea211f476ca942b (diff) | |
| download | git-htmldocs-cf4a17477022e58e1394a8ae62a80c9e40ff0ef5.tar.gz | |
Autogenerated HTML docs for v1.8.4-273-ga194
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/git-pull.txt b/git-pull.txt index 6ef8d599d..beea10b14 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -102,12 +102,18 @@ include::merge-options.txt[] :git-pull: 1 -r:: ---rebase:: - 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. +--rebase[=false|true|preserve]:: + 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 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 false, merge the current branch into the upstream branch. + See `pull.rebase`, `branch.<name>.rebase` and `branch.autosetuprebase` in linkgit:git-config[1] if you want to make `git pull` always use |