diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-05 19:00:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-05 19:00:49 (GMT) |
| commit | 9d3d78435f2735b74afc74e9c5a735c27c026d33 (patch) | |
| tree | 8f66df5b090f6163698d66cc9dd7a522ae359dfd /merge-file.h | |
| parent | 0074d18dc0d816f9842d3e0e1cd0b26341715b37 (diff) | |
| parent | 0c5e70f041bfda8b3899d13694a9093b41fafa19 (diff) | |
| download | git-9d3d78435f2735b74afc74e9c5a735c27c026d33.zip git-9d3d78435f2735b74afc74e9c5a735c27c026d33.tar.gz git-9d3d78435f2735b74afc74e9c5a735c27c026d33.tar.bz2 | |
Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag'
They both use the extended headers in commit objects, and the former has
necessary infrastructure to show them that is useful to view the result of
the latter.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.h')
0 files changed, 0 insertions, 0 deletions