From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 25 May 2008 01:38:47 GMT
Subject: Re: [PATCH] builtin-fast-export: Only output a single parent per line
Message-ID: <7vskw7jh7c.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1211671313-99006-1-git-send-email-pdebie@ai.rug.nl>

Pieter de Bie <pdebie@ai.rug.nl> writes:

> According to the git-fast-import man-page, you can only put a single
> committish per merge: line, like this:
>
>   merge :10
>   merge :11
>
> However, git-fast-export puts all parents on a single line, like this:
>
>   merge :10 :11
>
> This may be fine with git-fast-import,...

Is it fine for even git-fast-import?  fast-import.c: parse_merge() seems
to suggest that it also wants one parent per "merge " line.