mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  builtin-fast-export: Only output a single parent per line
  Release Notes for 1.5.5.2

Conflicts:

	RelNotes
This commit is contained in:
Junio C Hamano
2008-05-25 22:43:05 -07:00
parent fa620f1ac8 a2f5be5008
commit 8366b7baae
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-fast-export.c
View File

@ -204,14 +204,10 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
continue;
if (i == 0)
printf("from :%d\n", mark);
else if (i == 1)
printf("merge :%d", mark);
else
printf(" :%d", mark);
printf("merge :%d\n", mark);
i++;
}
if (i > 1)
printf("\n");
log_tree_diff_flush(rev);
rev->diffopt.output_format = saved_output_format;