summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-10-05 13:48:20 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-10-05 13:48:20 +0900
commit6551e69fd458766a22f6929fa46ac3197d6a3267 (patch)
tree5aad945016804cfd10d6e1b1fe0796bf2e6311a3 /Documentation/git-merge-tree.txt
parentMerge branch 'rs/use-free-and-null' (diff)
parentclang-format: add a comment about the meaning/status of the (diff)
downloadtgif-6551e69fd458766a22f6929fa46ac3197d6a3267.tar.xz
Merge branch 'sb/git-clang-format'
Add comment to clarify that the style file is meant to be used with clang-5 and the rules are still work in progress. * sb/git-clang-format: clang-format: add a comment about the meaning/status of the
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions