mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit: teach --amend to carry forward extra headers

Browse Source 
After running "git pull $there for-linus" to merge a signed tag, the
integrator may need to amend the resulting merge commit to fix typoes
in it. Teach --amend option to read the existing extra headers, and
carry them forward.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2011-11-08 15:38:07 -08:00
parent fab47d0575
commit ed7a42a075
3 changed files with 76 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
commit.h
View File

@ -200,6 +200,9 @@ extern int commit_tree_extended(const char *msg, unsigned char *tree,
const char *author,
struct commit_extra_header *);
extern struct commit_extra_header *read_commit_extra_headers(struct commit *);
extern struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len);
extern void free_commit_extra_headers(struct commit_extra_header *extra);
struct merge_remote_desc {