From: Stephen Boyd Date: Wed, 14 Jul 2010 05:15:46 GMT Subject: Re: [PATCH v3] add configuration variable for --autosquash option of interactive rebase Message-ID: <4C3D4802.2010707@gmail.com> In-Reply-To: <20100713112316.GA758@book.hvoigt.net> On 07/13/2010 04:24 AM, Heiko Voigt wrote: > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt > index be23ad2..d357ab1 100644 > --- a/Documentation/git-rebase.txt > +++ b/Documentation/git-rebase.txt > @@ -199,6 +199,9 @@ rebase.stat:: > Whether to show a diffstat of what changed upstream since the last > rebase. False by default. > > +rebase.autosquash:: > + If set to true enable '--autosquash' option by default. > + Can you squash this in too? I know we duplicate the wording, but rebase.stat has set some precedence here on that one. ---->8------- diff --git a/Documentation/config.txt b/Documentation/config.txt index 79d54e5..9e3c48b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1533,6 +1533,9 @@ rebase.stat:: Whether to show a diffstat of what changed upstream since the last rebase. False by default. +rebase.autosquash:: + If set to true enable '--autosquash' option by default. + receive.autogc:: By default, git-receive-pack will run "git-gc --auto" after receiving data from git-push and updating refs. You can stop