Re: [PATCHv3 1/2] git-rebase.txt: "--onto" option updated

From: konglu@minatec.inpg.fr <konglu@minatec.inpg.fr>
Date: Jun 8, 2012, 19:06 UTC
Message-ID: <20120608210630.Horde.joXbQHwdC4BP0k02QgDFpMA@webmail.minatec.grenoble-inp.fr>
In-Reply-To: <7vipf1d96k.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> a écrit :

Show 34 quoted lines

> Lucien Kong <Lucien.Kong@ensimag.imag.fr> writes:
>
>> The description of the option "--onto" is changed to be consistent
>> with the format of the other options.
>> ...
>>  OPTIONS
>>  -------
>> -<newbase>::
>> -	Starting point at which to create the new commits. If the
>> -	--onto option is not specified, the starting point is
>> -	<upstream>.  May be any valid commit, and not just an
>> -	existing branch name.
>> +--onto <newbase>::
>> +	With this option, git rebase takes all commits from <branch>,
>> +	that are not in <upstream>, and transplants them on top of
>> +	<newbase>. <newbase is the starting point at which to create
>> +	the new commits. If the --onto option is not specified, the
>> +	starting point is <upstream>.  May be any valid commit, and
>> +	not just an existing branch name.
>>  +
>>  As a special case, you may use "A\...B" as a shortcut for the
>>  merge base of A and B if there is exactly one merge base. You can
>
> This is doing two unrelated things in a single patch, isn't it?
>
> I would imagine that a patch that is about "to be consistent with
> the format" would be a one-liner
>
> 	-<newbase>::
>         +--onto <newbase>::
>
> without anything else.  The change this patch makes to the
> explanation is much larger, but that is not justified in the
> proposed commit log message.

That's what I thought, but it appeared to me that the description

--onto <newbase>::
         Starting point at which to create the new commits.
         If the --onto option is not specified, the starting
         point is <upstream>.  May be any valid commit, and
	not just an existing branch name.

only focus on the parameter <newbase>. It does not really explain first what the option is doing. With the second sentence, it's more like a description of "what happens when we run git rebase without --onto" than "what happens when we run git rebase with --onto".

Junio C Hamano <gitster@pobox.com> a écrit :

> 	--onto <newbase>::
> 		Description of what --onto option does and how <newbase>
> 		is used in what it does.