Re: [PATCH v4] pull --rebase: add --[no-]autostash flag

git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

From: Mehul Jain <mehul.jain2029@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
	Junio C Hamano <gitster@pobox.com>, Paul Tan <pyokagan@gmail.com>,
	Eric Sunshine <sunshine@sunshineco.com>,
	Mehul Jain <mehul.jain2029@gmail.com>
Subject: Re: [PATCH v4] pull --rebase: add --[no-]autostash flag
Date: Sat, 5 Mar 2016 17:56:13 +0530	[thread overview]
Message-ID: <CA+DCAeTsh8Ff8ifiE+e4_ng0tDB7z2uvkT2Nf5OhtZOBaoj9Kg@mail.gmail.com> (raw)
In-Reply-To: <1457171545-14496-1-git-send-email-mehul.jain2029@gmail.com>

On Sat, Mar 5, 2016 at 3:22 PM, Mehul Jain <mehul.jain2029@gmail.com> wrote:

> Changes:
>         * --no-autostash is passed to git-rebase (suggested by Paul)
>
>         * Error message changed when "git pull --[no-]autostash" is called.
>
>         * If rebase.autoStash is unset and user don't pass --[no-]autostash
>           flag then nothing is passed to git-rebase (i.e. if rebase.autoStash = -1),
>           as it should be left to git-rebase to decide what to do.

I'm sorry. Here instead of " ... (i.e. if rebase.autoStash = -1), ...
" it should be " ... (i.e. if opt_autostash = -1), ... " .

Thanks,
Mehul

next prev parent reply	other threads:[~2016-03-05 12:26 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-27 17:41 [PATCH v2 1/2] pull --rebase: add --[no-]autostash flag Mehul Jain
2016-02-27 17:41 ` [PATCH v2 2/2] Documentation/git-pull.txt: teach 'git pull --rebase' the --[no-]autostash option Mehul Jain
2016-02-27 19:26 ` [PATCH v2 1/2] pull --rebase: add --[no-]autostash flag Junio C Hamano
2016-02-28  9:51   ` Mehul Jain
2016-02-28 10:12     ` Matthieu Moy
2016-02-28 12:28   ` Paul Tan
2016-02-28 19:39     ` Junio C Hamano
2016-03-03 16:13 ` [PATCH v3 1/3] " Mehul Jain
2016-03-03 16:13   ` [PATCH v3 2/3] test: add test for " Mehul Jain
2016-03-03 17:31     ` Matthieu Moy
2016-03-04  5:43       ` Mehul Jain
2016-03-03 16:13   ` [PATCH v3 3/3] Documentation/git-pull: document --[no-]autostash option Mehul Jain
2016-03-03 17:14     ` Junio C Hamano
2016-03-04  5:04       ` Mehul Jain
2016-03-04  7:00         ` Matthieu Moy
2016-03-04 15:56     ` Paul Tan
2016-03-03 17:24   ` [PATCH v3 1/3] pull --rebase: add --[no-]autostash flag Matthieu Moy
2016-03-04  1:01     ` Eric Sunshine
2016-03-04  6:50       ` Matthieu Moy
2016-03-04  5:37     ` Mehul Jain
2016-03-04  6:51       ` Matthieu Moy
2016-03-04 15:52   ` Paul Tan
2016-03-05  9:52 ` [PATCH v4] " Mehul Jain
2016-03-05 12:26   ` Mehul Jain [this message]
2016-03-05 17:04   ` Junio C Hamano
2016-03-07  8:23     ` Mehul Jain
2016-03-07 12:37 ` [PATCH v5] " Mehul Jain
2016-03-07 23:01   ` Junio C Hamano
2016-03-08 18:19 ` [PATCH v6 1/2] git-pull.c: introduce git_pull_config() Mehul Jain
2016-03-08 18:19   ` [PATCH v6 2/2] pull --rebase: add --[no-]autostash flag Mehul Jain
2016-03-09  4:18 ` [PATCH v7 1/2] git-pull.c: introduce git_pull_config() Mehul Jain
2016-03-09  4:18   ` [PATCH v7 2/2] pull --rebase: add --[no-]autostash flag Mehul Jain
2016-03-11  4:51     ` Paul Tan
2016-03-11 13:15       ` Mehul Jain
2016-03-11 13:30         ` Matthieu Moy
2016-03-11 14:38           ` Mehul Jain
2016-03-12  6:49       ` Mehul Jain
2016-03-15 17:11 ` [PATCH 1/2] git-pull.c: introduce git_pull_config() Mehul Jain
2016-03-15 17:11   ` [PATCH 2/2] pull --rebase: add --[no-]autostash flag Mehul Jain
2016-03-15 21:43     ` Eric Sunshine
2016-03-16  5:00       ` Mehul Jain
2016-03-18  3:32         ` Eric Sunshine
2016-03-17  8:17       ` Mehul Jain
2016-03-18  3:53         ` Eric Sunshine

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=CA+DCAeTsh8Ff8ifiE+e4_ng0tDB7z2uvkT2Nf5OhtZOBaoj9Kg@mail.gmail.com \
    --to=mehul.jain2029@gmail.com \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.

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).