Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-01-02 23:38:30 +0300
committerJunio C Hamano <gitster@pobox.com>2020-01-02 23:38:30 +0300
commite0e1ac5db0235abba4038cf571a949c3f8c1b65c (patch)
tree852e46c071526382b9109d2aa1ed06903728d1d4
parentb76a244c9da0af40a0d2e123b12576fc64e6a354 (diff)
parent4fe7e43c53a6ad2948919503188bb2d34ce02fa9 (diff)
Merge branch 'en/rebase-signoff-fix'
"git rebase --signoff" stopped working when the command was written in C, which has been corrected. * en/rebase-signoff-fix: rebase: fix saving of --signoff state for am-based rebases
-rw-r--r--builtin/rebase.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c
index ddf33bc9d4..e354ec84bb 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -706,7 +706,7 @@ static int rebase_write_basic_state(struct rebase_options *opts)
write_file(state_dir_path("gpg_sign_opt", opts), "%s",
opts->gpg_sign_opt);
if (opts->signoff)
- write_file(state_dir_path("strategy", opts), "--signoff");
+ write_file(state_dir_path("signoff", opts), "--signoff");
return 0;
}