diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-07-22 05:04:49 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-07-22 11:54:30 -0700 |
| commit | 359ff6938990a438b99e95fe36b6b359f3eb9811 (patch) | |
| tree | 4203eb661be2b388947b38b8493c97fefa79fea8 /t/t9601/cvsroot/module | |
| parent | pull: abort by default when fast-forwarding is not possible (diff) | |
| download | tgif-359ff6938990a438b99e95fe36b6b359f3eb9811.tar.xz | |
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 't/t9601/cvsroot/module')
0 files changed, 0 insertions, 0 deletions