git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20bd3b0 5070b49)
Merge branch 'maint-1.5.4' into maint
authorJunio C Hamano <redacted>
Mon, 26 May 2008 05:34:05 +0000 (22:34 -0700)
committerJunio C Hamano <redacted>
Mon, 26 May 2008 05:34:05 +0000 (22:34 -0700)
* maint-1.5.4:
  builtin-fast-export: Only output a single parent per line

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

diff --cc builtin-fast-export.c
Simple merge
git clone https://git.99rst.org/PROJECT