diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-18 14:36:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-18 14:36:00 -0700 |
| commit | 3387423870e2efbc0b1bf7478a03320e55d2f0bc (patch) | |
| tree | c5348a045cce07f674fc28e5facf0f5e0d6746da /sequencer.h | |
| parent | d71abd99f82e7076775f12deb9326f7d26761591 (diff) | |
| parent | 5ed75e2a3fb30f93fea7772e481ec6091e9a2c5f (diff) | |
| download | git-3387423870e2efbc0b1bf7478a03320e55d2f0bc.tar.xz | |
Merge branch 'mv/cherry-pick-s'
After "git cherry-pick -s" gave control back to the user asking
help to resolve conflicts, concluding "git commit" needs to be run
with "-s" if the user wants to sign it off, but the command should
be able to remember that.
* mv/cherry-pick-s:
cherry-pick: don't forget -s on failure
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h index d8494201e0..60287b8da2 100644 --- a/sequencer.h +++ b/sequencer.h @@ -49,4 +49,8 @@ extern void remove_sequencer_state(void); int sequencer_pick_revisions(struct replay_opts *opts); +extern const char sign_off_header[]; + +void append_signoff(struct strbuf *msgbuf, int ignore_footer); + #endif |