diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-05-23 14:54:31 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-23 14:54:31 -0700 |
commit | 72ce3ff7b51c1e0703f433fb000519521441abf8 (patch) | |
tree | 84a81f6bd529fe6d4236eabf9dca5e78b4cba07e /patch-ids.h | |
parent | 8e342255224f459ddff4d7f974161ae47d26d1d7 (diff) | |
parent | bb52995f3ec7fac2b282a91af4230e4f387af234 (diff) | |
download | git-72ce3ff7b51c1e0703f433fb000519521441abf8.tar.gz |
Merge branch 'xy/format-patch-base'
"git format-patch" learned a new "--base" option to record what
(public, well-known) commit the original series was built on in
its output.
* xy/format-patch-base:
format-patch: introduce format.useAutoBase configuration
format-patch: introduce --base=auto option
format-patch: add '--base' option to record base tree info
patch-ids: make commit_patch_id() a public helper function
Diffstat (limited to 'patch-ids.h')
-rw-r--r-- | patch-ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/patch-ids.h b/patch-ids.h index c8c7ca110a..eeb56b307f 100644 --- a/patch-ids.h +++ b/patch-ids.h @@ -13,6 +13,8 @@ struct patch_ids { struct patch_id_bucket *patches; }; +int commit_patch_id(struct commit *commit, struct diff_options *options, + unsigned char *sha1); int init_patch_ids(struct patch_ids *); int free_patch_ids(struct patch_ids *); struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *); |