From: Eric Sunshine <sunshine@sunshineco.com>
To: Vasily Titskiy <qehgt0@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH v2] Ignore dirty submodule states during stash
Date: Tue, 17 May 2016 12:58:08 -0400 [thread overview]
Message-ID: <CAPig+cSFD+4zhvxpqjGWomq1uW3JxCNi6pQP3f_bp4Tr1Kg5aA@mail.gmail.com> (raw)
In-Reply-To: <20160517131635.GA5299@gmail.com>
On Tue, May 17, 2016 at 9:16 AM, Vasily Titskiy <qehgt0@gmail.com> wrote:
> As stash does not know how to deal with submodules,
> it should not try to save/restore their states
> as it leads to redundant merge conflicts.
>
> Added test checks if 'stash pop' does not trigger merge conflics
/conflics/conflicts/
> in submodules.
>
> Signed-off-by: Vasily Titskiy <qehgt0@gmail.com>
prev parent reply other threads:[~2016-05-17 16:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-17 13:16 [PATCH v2] Ignore dirty submodule states during stash Vasily Titskiy
2016-05-17 16:15 ` Junio C Hamano
2016-05-17 16:38 ` Vasily Titskiy
2016-05-17 17:04 ` Junio C Hamano
2016-05-17 17:12 ` Vasily Titskiy
2016-05-17 16:58 ` Eric Sunshine [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=CAPig+cSFD+4zhvxpqjGWomq1uW3JxCNi6pQP3f_bp4Tr1Kg5aA@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=qehgt0@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 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).