My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c31b87d 8098878)
Merge branch 'bk/submodule-in-recursive-merge'
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 17:48:38 +0000 (10:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 17:48:38 +0000 (10:48 -0700)
* bk/submodule-in-recursive-merge:
  submodule: Search for merges only at end of recursive merge
  submodule: Demonstrate known breakage during recursive merge


Trivial merge
The core git plumbing