Merge branch 'nm/maint-conflicted-submodule-entries'
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Apr 2011 10:41:24 +0000 (03:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Apr 2011 10:41:24 +0000 (03:41 -0700)
commit1eb71bc...ec609c67b8a308f9267691144a48bffd
tree85e1c10...4de559a38f2f620fcdf103ccf8f2467dcopy hash to clipboard (tree)
parent44bc573...36c98b7c6cd798af04c538f6e76f0f6ecopy hash to clipboard (diff)
parent313ee0d...9f58c2bf2f4e0a62b812c9d08a39b240copy hash to clipboard (diff)
Documentation/git-submodule.txt