diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-07-27 15:14:18 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-07-27 15:14:18 -0700 |
commit | 16737445a94cb9b18378fff973129d974c7cdf8a (patch) | |
tree | 44fe2074f4d4f146581e33e6d4b15bb9740c0b10 /commit.h | |
parent | 4799593e26f09e4209249caf9536001036618ac2 (diff) | |
parent | 3fa102590758594e3df45c58caba945894a608e5 (diff) | |
download | git-16737445a94cb9b18378fff973129d974c7cdf8a.tar.gz |
Merge branch 'cc/replace-graft'
"git replace" learned a "--graft" option to rewrite parents of a
commit.
* cc/replace-graft:
replace: add test for --graft with a mergetag
replace: check mergetags when using --graft
replace: add test for --graft with signed commit
replace: remove signature when using --graft
contrib: add convert-grafts-to-replace-refs.sh
Documentation: replace: add --graft option
replace: add test for --graft
replace: add --graft option
replace: cleanup redirection style in tests
Diffstat (limited to 'commit.h')
-rw-r--r-- | commit.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -333,6 +333,8 @@ struct commit *get_merge_parent(const char *name); extern int parse_signed_commit(const struct commit *commit, struct strbuf *message, struct strbuf *signature); +extern int remove_signature(struct strbuf *buf); + extern void print_commit_list(struct commit_list *list, const char *format_cur, const char *format_last); |