From: Junio C Hamano <gitster@pobox.com>
To: Paul Tan <pyokagan@gmail.com>
Cc: Mehul Jain <mehul.jain2029@gmail.com>,
Git List <git@vger.kernel.org>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: Re: [PATCH v2 1/2] pull --rebase: add --[no-]autostash flag
Date: Sun, 28 Feb 2016 11:39:22 -0800 [thread overview]
Message-ID: <xmqqd1rgeiad.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CACRoPnT6Yc_vfrYvzKctL1dDkZCzme-4emLF0MysJq4f_H2OvQ@mail.gmail.com> (Paul Tan's message of "Sun, 28 Feb 2016 20:28:49 +0800")
Paul Tan <pyokagan@gmail.com> writes:
> Ultimately, git-pull needs to be aware of whether autostash is active
> or not (and this means rebase.autostash needs to be looked at as well)
> because if autostash is disabled, git-pull needs to perform the
> "worktree is clean" check. And this "worktree is clean" check needs to
> be done *before* git-fetch and git-rebase is run.
Ahh, right. I forgot about that discussion.
next prev parent reply other threads:[~2016-02-28 19:39 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 [this message]
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
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=xmqqd1rgeiad.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=mehul.jain2029@gmail.com \
--cc=pyokagan@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.