diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-08 14:21:33 -0700 |
| commit | 880b3fee51e9b5b0bb7c0361fd3bf2c5fedda5bf (patch) | |
| tree | 8f8b8c40c0e6914a81d5ac2c3b3658389f06de10 /Documentation/git-show-branch.txt | |
| parent | Merge branch 'mh/blame-worktree' into maint (diff) | |
| parent | cache-tree: do not generate empty trees as a result of all i-t-a subentries (diff) | |
| download | tgif-880b3fee51e9b5b0bb7c0361fd3bf2c5fedda5bf.tar.xz | |
Merge branch 'nd/cache-tree-ita' into maint
"git add -N dir/file && git write-tree" produced an incorrect tree
when there are other paths in the same directory that sorts after
"file".
* nd/cache-tree-ita:
cache-tree: do not generate empty trees as a result of all i-t-a subentries
cache-tree.c: fix i-t-a entry skipping directory updates sometimes
test-lib.sh: introduce and use $EMPTY_BLOB
test-lib.sh: introduce and use $EMPTY_TREE
Diffstat (limited to 'Documentation/git-show-branch.txt')
0 files changed, 0 insertions, 0 deletions