summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-18 11:16:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-18 11:16:56 -0700
commite09151281ded5e05ee64e67e5d20529953c23b65 (patch)
treec6ef6e2026e82dacd498e251761dfa9a5c8147b9 /Documentation/technical/trivial-merge.txt
parentMerge branch 'jc/t9129-any-utf8' (diff)
parentls-files: allow relative pathspec (diff)
downloadtgif-e09151281ded5e05ee64e67e5d20529953c23b65.tar.xz
Merge branch 'cb/ls-files-cdup'
* cb/ls-files-cdup: ls-files: allow relative pathspec quote.c: separate quoting and relative path generation
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions