On Tue, Jul 13, 2010 at 1:24 PM, Heiko Voigt <hvoigt@xxxxxxxxxx> 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@xxxxxxxxxx> [...] > @@ -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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html