summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-25 08:27:09 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-25 08:27:09 -0800
commitef94636a4def20453a6552c278a27820f2ccf79b (patch)
tree7a6479cb19722d0b6a19a63f5689e0f314dd6e15 /Documentation/technical/trivial-merge.txt
parentMerge branch 'ct/autoconf-htmldir' (diff)
parentname-hash: allow hashing an empty string (diff)
downloadtgif-ef94636a4def20453a6552c278a27820f2ccf79b.tar.xz
Merge branch 'as/check-ignore'
"git check-ignore ." segfaulted, as a function it calls deep in its callchain took a string in the <ptr, length> form but did not stop when given an empty string. * as/check-ignore: name-hash: allow hashing an empty string t0008: document test_expect_success_multi
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions