]> rtime.felk.cvut.cz Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2aa3140 39d8e27)
Merge branch 'cb/maint-merge-recursive-submodule-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 18 Apr 2009 21:18:25 +0000 (14:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 18 Apr 2009 21:18:25 +0000 (14:18 -0700)
* cb/maint-merge-recursive-submodule-fix:
  simplify output of conflicting merge
  update cache for conflicting submodule entries
  add tests for merging with submodules


Trivial merge
Git mirror and local development