summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-09-08 08:54:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-08 08:54:01 -0700
commit9f44723d1a2c6a97306a7160deeab621e08bea7a (patch)
tree0ad4ae4a8de137be14011c8b7f3b8c01875ce997 /Documentation/config.txt
parentMerge branch 'maint' (diff)
parentfast-export: ensure that a renamed file is printed after all references (diff)
downloadtgif-9f44723d1a2c6a97306a7160deeab621e08bea7a.tar.xz
Merge branch 'en/d-f-conflict-fix'
* en/d-f-conflict-fix: fast-export: ensure that a renamed file is printed after all references
Diffstat (limited to 'Documentation/config.txt')
0 files changed, 0 insertions, 0 deletions