git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Mehul Jain <mehul.jain2029@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com, pyokagan@gmail.com,
	sunshine@sunshineco.com
Subject: Re: [PATCH v10 2/2] pull --rebase: add --[no-]autostash flag
Date: Fri, 25 Mar 2016 10:05:28 +0100	[thread overview]
Message-ID: <vpqshzfuduv.fsf@anie.imag.fr> (raw)
In-Reply-To: <1458591170-28079-1-git-send-email-mehul.jain2029@gmail.com> (Mehul Jain's message of "Tue, 22 Mar 2016 01:42:50 +0530")

Mehul Jain <mehul.jain2029@gmail.com> writes:

> +--autostash::
> +--no-autostash::
> +	Before starting rebase, stash local modifications away (see
> +	linkgit:git-stash[1]) if needed, and apply the stash when
> +	done. `--no-autostash` is useful to override the `rebase.autoStash`
> +	configuration variable (see linkgit:git-config[1]).
> ++
> +This option is only valid when "--rebase" is used.

This does not have to be added to this series (I don't want to break
everything at v10 ...), but I think it would be nice to allow "git pull
--autostash" even without --rebase if pull.rebase=true.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

  parent reply	other threads:[~2016-03-25  9:05 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-21 18:18 [PATCH v10 0/2] introduce --[no-]autostash command line flag Mehul Jain
2016-03-21 18:18 ` [PATCH v10 1/2] git-pull.c: introduce git_pull_config() Mehul Jain
2016-03-21 18:18 ` [PATCH v10 2/2] pull --rebase: add --[no-]autostash flag Mehul Jain
2016-03-21 18:39   ` Matthieu Moy
2016-03-21 20:12 ` Mehul Jain
2016-03-25  8:31   ` Eric Sunshine
2016-03-25  8:44     ` Eric Sunshine
2016-03-25 16:37       ` Eric Sunshine
2016-03-25 18:07     ` Mehul Jain
2016-03-25 22:29       ` Eric Sunshine
2016-03-25  9:05   ` Matthieu Moy [this message]
2016-03-25 18:10     ` Mehul Jain
2016-03-25 18:37       ` Matthieu Moy
2016-03-25 19:07         ` Mehul Jain
2016-03-25  7:23 ` [PATCH v10 0/2] introduce --[no-]autostash command line flag Eric Sunshine
2016-03-25 18:01   ` Mehul Jain

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=vpqshzfuduv.fsf@anie.imag.fr \
    --to=matthieu.moy@grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mehul.jain2029@gmail.com \
    --cc=pyokagan@gmail.com \
    --cc=sunshine@sunshineco.com \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).