On Thu, Mar 3, 2016 at 10:44 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Should this entry this verbose? > > - Is there a non-temporary stash? > > - I think "This means that ..." is totally unnecessary. > > - It probably makes sense to have "This option is only valid..." as > a separate second paragraph as you did. > > - "The default is..." is misleading. Even if rebase.autostash is > set to false, we won't autostash, but that is different from the > default being "--no-autostash". > > Think of "--[no-]autostash" option as *ONE* way to affect the > auto-stashing behaviour, and treat "options" and "behaviours" two > different things. > > There is no default "option" for this. It is that "autostash" > behaviour defaults to what is given to rebase.autostash if > exists, and can be explicitly set by --[no-]autostash if given. > > But that is the norm for any configuration and option that overrides > the configuration, so it probably is a better use of the ink to say > something like this perhaps? > > --autostash:: > --no-autostash:: > Before starting "pull --rebase", create a stash to save > local modifications, and apply the stash when done (this > option is only valid when "--rebase" is used). OK, but according to the definition of --[no-]autostash given in git-rebase documentation (https://git-scm.com/docs/git-rebase), temporary stash is created. So shouldn't we be consistent with this definition by writing "... , create a temporary stash ..." instead of "... , create a stash ...". > + > '--no-autostash' is useful to override the 'rebase.autoStash' > configuration variable (see linkgit:git-config[1]). Thanks, Mehul -- 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