[tokkee]

tokkee.org

Code

projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92b501f ff7f089)
Merge branch 'jm/mergetool-submodules' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 15 May 2011 22:57:16 +0000 (15:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 15 May 2011 22:57:16 +0000 (15:57 -0700)
* jm/mergetool-submodules:
  mergetool: Teach about submodules


Trivial merge
Git - the stupid content tracker