]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df0a6ae 313ee0d)
Merge branch 'nm/maint-conflicted-submodule-entries' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2011 17:41:17 +0000 (10:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2011 17:41:17 +0000 (10:41 -0700)
* nm/maint-conflicted-submodule-entries:
  submodule: process conflicting submodules only once


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.