Re: [PATCH v10 2/2] pull --rebase: add --[no-]autostash flag

From: Mehul Jain <mehul.jain2029@gmail.com>
Date: Mar 25, 2016, 18:10 UTC
Message-ID: <CA+DCAeTNv-2RkbGo+ciKP_bfCvThKjGAsJEr=xuBYBFgrTvGtg@mail.gmail.com>
In-Reply-To: <vpqshzfuduv.fsf@anie.imag.fr>

On Fri, Mar 25, 2016 at 2:35 PM, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> wrote:

Show 14 quoted lines

> Mehul Jain <mehul.jain2029@gmail.com> writes:
>
>> +--autostash::
>> +--no-autostash::
>> +     Before starting rebase, stash local modifications away (see
>> +     linkgit:git-stash[1]) if needed, and apply the stash when
>> +     done. `--no-autostash` is useful to override the `rebase.autoStash`
>> +     configuration variable (see linkgit:git-config[1]).
>> ++
>> +This option is only valid when "--rebase" is used.
>
> This does not have to be added to this series (I don't want to break
> everything at v10 ...), but I think it would be nice to allow "git pull
> --autostash" even without --rebase if pull.rebase=true.

This is a nice observation. As current patch allow "git pull --autostash" to be run without --rebase if pull.rebase=true, hence correct documentation should be something like this

    This option is only valid when "--rebase" is used or pull.rebase=true.

But OTOH users who knows about pull.rebase understands that pull.rebase=true means "git pull --rebase ..." will be executed whenever "git pull ..." is called, thus for those users it might be easy to deduce that need of "--rebase" for validity of "--autostash" is not necessary if pull.rebase=true.

I will correct it in the re-roll.

Thanks, Mehul