projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0acb62f e07665e)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Mar 2010 04:52:18 +0000 (21:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Mar 2010 04:52:18 +0000 (21:52 -0700)
* maint:
  Prepare for 1.7.0.4

Conflicts:
RelNotes


Trivial merge
Git—the stupid content tracker