aboutsummaryrefslogtreecommitdiff
path: root/mergetools/bc3
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-07-27 12:21:46 -0700
committerJunio C Hamano <gitster@pobox.com>2015-07-27 12:21:46 -0700
commit315b3ba3e421f66527a71bbc2e3a7c90e9c6d8e5 (patch)
tree1d9e1c2af033f6a491fba10bbd41bcaa7586be96 /mergetools/bc3
parentbde6a72af5b5dc9f1e489c8103ea900e266ab766 (diff)
parent83fe16703e3f5c39078db11449fd43f24a8f32f0 (diff)
downloadgit-315b3ba3e421f66527a71bbc2e3a7c90e9c6d8e5.tar.gz
git-315b3ba3e421f66527a71bbc2e3a7c90e9c6d8e5.tar.xz
Merge branch 'mm/branch-doc-updates' into maint
* mm/branch-doc-updates: Documentation/branch: document -M and -D in terms of --force Documentation/branch: document -d --force and -m --force
Diffstat (limited to 'mergetools/bc3')
0 files changed, 0 insertions, 0 deletions