summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-09-04 12:36:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-04 12:36:51 -0700
commit5fb0e0868c25d4be66ead46992c393ed5f91c2d1 (patch)
tree2b382daeba5b2deb656bbb4fd4483f08e5d38206 /Documentation/git-merge-tree.txt
parentMerge branch 'sg/bash-prompt-lf-in-cwd-test' (diff)
parentavoid segfault on submodule.*.path set to an empty "true" (diff)
downloadtgif-5fb0e0868c25d4be66ead46992c393ed5f91c2d1.tar.xz
Merge branch 'jl/some-submodule-config-are-not-boolean'
* jl/some-submodule-config-are-not-boolean: avoid segfault on submodule.*.path set to an empty "true"
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions