diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:11 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:11 -0800 |
commit | b2132068c6df38b24b49dfc6fbbf0645b21ec037 (patch) | |
tree | 56fc704257887e0788cc73e654393605da8171c2 /t/t8004-blame-with-conflicts.sh | |
parent | Merge branch 'jk/sha1write-void' (diff) | |
parent | cat-file: provide %(deltabase) batch format (diff) | |
download | tgif-b2132068c6df38b24b49dfc6fbbf0645b21ec037.tar.xz |
Merge branch 'jk/oi-delta-base'
Teach "cat-file --batch" to show delta-base object name for a
packed object that is represented as a delta.
* jk/oi-delta-base:
cat-file: provide %(deltabase) batch format
sha1_object_info_extended: provide delta base sha1s
Diffstat (limited to 't/t8004-blame-with-conflicts.sh')
0 files changed, 0 insertions, 0 deletions