aboutsummaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-02-15 12:54:18 -0800
committerJunio C Hamano <gitster@pobox.com>2017-02-15 12:54:18 -0800
commit2f4e87d7777a0bcffa8a7cc3cc52e1e8b2c352ff (patch)
treeb2c7bd459ce4888029bcd92ecb479cc5aed7dc9f /mergetools
parent5588dbffbd61e4906e453808c6ad32f792fea521 (diff)
parentfc01a5d26a8f0f80db8302d3ef3ce10924a68581 (diff)
downloadgit-2f4e87d7777a0bcffa8a7cc3cc52e1e8b2c352ff.tar.gz
git-2f4e87d7777a0bcffa8a7cc3cc52e1e8b2c352ff.tar.xz
Merge branch 'sb/submodule-doc'
Doc updates. * sb/submodule-doc: submodule update documentation: don't repeat ourselves submodule documentation: add options to the subcommand
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions