]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commit1eb71bc0ec609c67b8a308f9267691144a48bffd
tree85e1c1054de559a38f2f620fcdf103ccf8f2467d
parent44bc573436c98b7c6cd798af04c538f6e76f0f6e
parent313ee0d69f58c2bf2f4e0a62b812c9d08a39b240
Merge branch 'nm/maint-conflicted-submodule-entries'

* nm/maint-conflicted-submodule-entries:
  submodule: process conflicting submodules only once
Documentation/git-submodule.txt