summaryrefslogtreecommitdiff
path: root/gettext.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-08-08 14:21:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-08 14:21:33 -0700
commit880b3fee51e9b5b0bb7c0361fd3bf2c5fedda5bf (patch)
tree8f8b8c40c0e6914a81d5ac2c3b3658389f06de10 /gettext.c
parentMerge branch 'mh/blame-worktree' into maint (diff)
parentcache-tree: do not generate empty trees as a result of all i-t-a subentries (diff)
downloadtgif-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 'gettext.c')
0 files changed, 0 insertions, 0 deletions