Merge branch 'tr/do-not-call-submodules-subprojects'
commit4ca8ae712c1bf73bf41247aed119a44acc01de03
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:23:30 +0000 (22 11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:23:30 +0000 (22 11:23 -0700)
treea31a86941bf1d33c3230bf299fe5458d3f6c0515
parente2ecd252b5e3c90c211075ba9d1017379782708b
parent465cf8ce453dc3e266171ece2ea886acd8c7d714
Merge branch 'tr/do-not-call-submodules-subprojects'

* tr/do-not-call-submodules-subprojects:
  show-branch: fix description of --date-order
  apply, entry: speak of submodules instead of subprojects
builtin/apply.c
builtin/show-branch.c