Merge branch 'lv/status-say-working-tree-not-directory'

diff --git a/builtin/pull.c b/builtin/pull.c
index 1d7333c8a11f7aedf244c99f5ac67bea7fccaab4..897a7f4e4e040089b4021a9a0e217fbb63e7c6ec 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -815,6 +815,9 @@ static int run_rebase(const unsigned char *curr_head,
                argv_array_push(&args, "--no-autostash");
        else if (opt_autostash == 1)
                argv_array_push(&args, "--autostash");
+       if (opt_verify_signatures &&
+           !strcmp(opt_verify_signatures, "--verify-signatures"))
+               warning(_("ignoring --verify-signatures for rebase"));
 
        argv_array_push(&args, "--onto");
        argv_array_push(&args, sha1_to_hex(merge_head));