summaryrefslogtreecommitdiff
path: root/cache-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-08-22 12:34:12 -0700
committerJunio C Hamano <gitster@pobox.com>2019-08-22 12:34:12 -0700
commit22e86e85cba1e2697aea46810238ef9b3c7401cf (patch)
tree9a2a806b4ed5e4e373c854e26df51497fc6b410e /cache-tree.c
parent9c7573581c0804a5225b486d03f45cc3200b69b1 (diff)
parentd1387d389549fe6e1b97ad88a0f7dbf3afe96c16 (diff)
Merge branch 'en/fast-import-merge-doc'
Doc update. * en/fast-import-merge-doc: git-fast-import.txt: clarify that multiple merge commits are allowed
Diffstat (limited to 'cache-tree.c')
0 files changed, 0 insertions, 0 deletions