From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 May 2008 05:43:05 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6-rc1~47
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8366b7baae7e5a33f609b07c939a3571653a2314?ds=inline;hp=-c

Merge branch 'maint'

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

Conflicts:

RelNotes
---

8366b7baae7e5a33f609b07c939a3571653a2314
diff --combined builtin-fast-export.c
index ff759cc578,4ab93fcf78..1dfc01e8f0
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@@ -204,14 -204,10 +204,10 @@@ static void handle_commit(struct commi
  			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;
@@@ -372,7 -368,7 +368,7 @@@ int cmd_fast_export(int argc, const cha
  	};
  
  	/* we handle encodings */
 -	git_config(git_default_config);
 +	git_config(git_default_config, NULL);
  
  	init_revisions(&revs, prefix);
  	argc = setup_revisions(argc, argv, &revs, NULL);