git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Federico Bond <federico.bond@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git pull --rebase --autostash
Date: Mon, 11 Jan 2016 16:03:34 -0500	[thread overview]
Message-ID: <20160111210334.GB14535@sigill.intra.peff.net> (raw)
In-Reply-To: <CABKJOiy1+QAgp=_3ofr4CqNH7ZPP_eR4P71yGSgeAYLBz92AZQ@mail.gmail.com>

On Fri, Jan 08, 2016 at 12:24:09PM -0300, Federico Bond wrote:

> I was looking through the changes in 2.7 and learned about the very
> useful autostash feature of git rebase which was present since git
> 1.8.4.
> 
> I was wondering if there has been discussion about adding the same
> flag(s) for use with git pull --rebase. It seems odd that git pull
> --rebase honors the rebase.autostash config setting but there is no
> way to override it with a flag.
> 
> If you are OK with this, I can work on a patch to add --[no-]autostash
> to git pull.

I don't use either feature myself, but I agree that we generally like to
have matching command line flags to countermand config options.

I seem to recall another thread recently where somebody wanted to pass
an option to rebase via "git pull", but I can't seem to dig it up just
now. Having a generic way to pass such options seems like it could be
useful, though (e.g., "--keep-empty" might be useful).

-Peff

      reply	other threads:[~2016-01-11 21:03 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-08 15:24 git pull --rebase --autostash Federico Bond
2016-01-11 21:03 ` Jeff King [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160111210334.GB14535@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=federico.bond@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).