diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-01-02 20:38:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-02 20:38:30 (GMT) |
| commit | e0e1ac5db0235abba4038cf571a949c3f8c1b65c (patch) | |
| tree | 852e46c071526382b9109d2aa1ed06903728d1d4 /builtin | |
| parent | b76a244c9da0af40a0d2e123b12576fc64e6a354 (diff) | |
| parent | 4fe7e43c53a6ad2948919503188bb2d34ce02fa9 (diff) | |
| download | git-e0e1ac5db0235abba4038cf571a949c3f8c1b65c.zip git-e0e1ac5db0235abba4038cf571a949c3f8c1b65c.tar.gz git-e0e1ac5db0235abba4038cf571a949c3f8c1b65c.tar.bz2 | |
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index ddf33bc..e354ec8 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; } |