From: Santi Béjar <santi@agolina.net>
Date: Tue, 13 Jul 2010 12:34:54 GMT
Subject: Re: [PATCH v3] add configuration variable for --autosquash option of interactive rebase
Message-ID: <AANLkTilFOOK1eXkzWJXlr3zf78xZ82nIK9Jrr1END3-Y@mail.gmail.com>
In-Reply-To: <20100713112316.GA758@book.hvoigt.net>

On Tue, Jul 13, 2010 at 1:24 PM, Heiko Voigt <hvoigt@hvoigt.net> wrote:
> If you use this feature regularly you can now enable it by default. In
> case the user wants to override this config on the commandline
> --no-autosquash can be used to force disabling.
>
> Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>

[...]

> @@ -335,6 +338,11 @@ idea unless you know what you are doing (see BUGS below).
>  +
>  This option is only valid when the '--interactive' option is used.
>
> +--no-autosquash::
> +       If the '--autosquash' option is enabled by default using the
> +       configuration variable `rebase.autosquash` this option can be
> +       used to override and disable this setting.
> +

You could also merge this entry with the --autosquash as with --squash
option in git-pull(1):

--autosquash::
--noautosquash::
[original text]
+
If the '--autosquash' option is enabled by default using the
configuration variable `rebase.autosquash` this option can be
used to override and disable this setting.

Santi