git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44bc573 313ee0d)
Merge branch 'nm/maint-conflicted-submodule-entries'
authorJunio C Hamano <redacted>
Mon, 4 Apr 2011 10:41:24 +0000 (03:41 -0700)
committerJunio C Hamano <redacted>
Mon, 4 Apr 2011 10:41:24 +0000 (03:41 -0700)
* nm/maint-conflicted-submodule-entries:
  submodule: process conflicting submodules only once

1  2 
Documentation/git-submodule.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/git-submodule.txt
Simple merge
git clone https://git.99rst.org/PROJECT