projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa620f1 a2f5be5)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 May 2008 05:43:05 +0000 (22:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 May 2008 05:43:05 +0000 (22:43 -0700)
* maint:
  builtin-fast-export: Only output a single parent per line
  Release Notes for 1.5.5.2

Conflicts:

RelNotes

1  2 
builtin-fast-export.c patch | diff1 | diff2 | blob | history

diff --cc builtin-fast-export.c
Simple merge
Git—the stupid content tracker