summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2021-07-22 05:04:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-07-22 18:54:30 (GMT)
commit359ff6938990a438b99e95fe36b6b359f3eb9811 (patch)
tree4203eb661be2b388947b38b8493c97fefa79fea8 /Documentation/git-pull.txt
parent031e2f7ae195069d00d21cde906fce5b0318dbdd (diff)
downloadgit-359ff6938990a438b99e95fe36b6b359f3eb9811.zip
git-359ff6938990a438b99e95fe36b6b359f3eb9811.tar.gz
git-359ff6938990a438b99e95fe36b6b359f3eb9811.tar.bz2
pull: update docs & code for option compatibility with rebasing
git-pull.txt includes merge-options.txt, which is written assuming merges will happen. git-pull has allowed rebases for many years; update the documentation to reflect that. While at it, pass any `--signoff` flag through to the rebase backend too so that we don't have to document it as merge-specific. Rebase has supported the --signoff flag for years now as well. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pull.txt')
-rw-r--r--Documentation/git-pull.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index cad3f6b..077961d 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -19,13 +19,12 @@ Incorporates changes from a remote repository into the current branch.
If the current branch is behind the remote, then by default it will
fast-forward the current branch to match the remote. If the current
branch and the remote have diverged, the user needs to specify how to
-reconcile the divergent branches with `--no-ff`, `--ff`, or `--rebase`
-(or the corresponding configuration options in `pull.ff` or
-`pull.rebase`).
+reconcile the divergent branches with `--rebase` or `--no-rebase` (or
+the corresponding configuration option in `pull.rebase`).
More precisely, `git pull` runs `git fetch` with the given parameters
and then depending on configuration options or command line flags,
-will call either `git merge` or `git rebase` to reconcile diverging
+will call either `git rebase` or `git merge` to reconcile diverging
branches.
<repository> should be the name of a remote repository as
@@ -136,7 +135,7 @@ published that history already. Do *not* use this option
unless you have read linkgit:git-rebase[1] carefully.
--no-rebase::
- Override earlier --rebase.
+ This is shorthand for --rebase=false.
Options related to fetching
~~~~~~~~~~~~~~~~~~~~~~~~~~~