diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-10-03 13:22:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-03 13:22:13 -0700 |
| commit | f4315eed7f3d528d5907c52f93e44fc351f3e0d6 (patch) | |
| tree | d098d926d43757ed86a60362cdf8acbe43321932 /mergetools/tkdiff | |
| parent | Prepare for 2.10.1 (diff) | |
| parent | pack-objects: walk tag chains for --include-tag (diff) | |
| download | tgif-f4315eed7f3d528d5907c52f93e44fc351f3e0d6.tar.xz | |
Merge branch 'jk/pack-tag-of-tag' into maint
"git pack-objects --include-tag" was taught that when we know that
we are sending an object C, we want a tag B that directly points at
C but also a tag A that points at the tag B. We used to miss the
intermediate tag B in some cases.
* jk/pack-tag-of-tag:
pack-objects: walk tag chains for --include-tag
t5305: simplify packname handling
t5305: use "git -C"
t5305: drop "dry-run" of unpack-objects
t5305: move cleanup into test block
Diffstat (limited to 'mergetools/tkdiff')
0 files changed, 0 insertions, 0 deletions