summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-03-14 12:01:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-03-14 12:01:06 -0700
commit99321e327b4df8d9d6724cf26bab7429edbdb718 (patch)
tree634f157cdbf88c274d9321dafb8de6d67e4b3781 /Documentation/git-merge-tree.txt
parentMerge branch 'jk/smart-http-protocol-doc-fix' (diff)
parentobject.h: realign object flag allocation comment (diff)
downloadtgif-99321e327b4df8d9d6724cf26bab7429edbdb718.tar.xz
Merge branch 'nd/object-allocation-comments'
Code doc update. * nd/object-allocation-comments: object.h: realign object flag allocation comment object.h: update flag allocation comment
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions