]> git.tokkee.org Git - git.git/commitdiff
[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ab576c ff7f089)
Merge branch 'jm/mergetool-submodules'
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 22:51:23 +0000 (15:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 May 2011 22:51:23 +0000 (15:51 -0700)
* jm/mergetool-submodules:
  mergetool: Teach about submodules


Trivial merge
Git - the stupid content tracker