summaryrefslogtreecommitdiff
path: root/builtin
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 /builtin
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 'builtin')
-rw-r--r--builtin/pull.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index 4514a14..2f1d1f4 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -893,6 +893,8 @@ static int run_rebase(const struct object_id *newbase,
strvec_pushv(&args, opt_strategy_opts.v);
if (opt_gpg_sign)
strvec_push(&args, opt_gpg_sign);
+ if (opt_signoff)
+ strvec_push(&args, opt_signoff);
if (opt_autostash == 0)
strvec_push(&args, "--no-autostash");
else if (opt_autostash == 1)