]> git.ipfire.org Git - thirdparty/git.git/commit
pull: update docs & code for option compatibility with rebasing
authorElijah Newren <newren@gmail.com>
Thu, 22 Jul 2021 05:04:49 +0000 (05:04 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Jul 2021 18:54:30 +0000 (11:54 -0700)
commit359ff6938990a438b99e95fe36b6b359f3eb9811
tree4203eb661be2b388947b38b8493c97fefa79fea8
parent031e2f7ae195069d00d21cde906fce5b0318dbdd
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>
Documentation/git-merge.txt
Documentation/git-pull.txt
Documentation/merge-options.txt
builtin/pull.c