summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-10-28 10:18:40 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-10-28 10:18:40 +0900
commit986ffdc83ea3f975aacf2c2f3b6c6ac569b13780 (patch)
tree2044b78689aaf442b66a7276f2f42a3c5c5fccf7 /builtin/merge-tree.c
parentMerge branch 'ao/path-use-xmalloc' (diff)
parentdocs: fix formatting of rev-parse's --show-superproject-working-tree (diff)
downloadtgif-986ffdc83ea3f975aacf2c2f3b6c6ac569b13780.tar.xz
Merge branch 'sb/rev-parse-show-superproject-root'
Doc markup fix. * sb/rev-parse-show-superproject-root: docs: fix formatting of rev-parse's --show-superproject-working-tree
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions