From: Thomas Rast <trast@student.ethz.ch>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: Nguyen Thai Ngoc Duy <pclouds@gmail.com>,
Casey McGinty <casey.mcginty@gmail.com>, <git@vger.kernel.org>
Subject: Re: Git automatic stashing?
Date: Tue, 9 Nov 2010 20:19:09 +0100 [thread overview]
Message-ID: <201011092019.09239.trast@student.ethz.ch> (raw)
In-Reply-To: <vpqd3qe8g5j.fsf@bauges.imag.fr>
Matthieu Moy wrote:
> Nguyen Thai Ngoc Duy <pclouds@gmail.com> writes:
>
> > On Tue, Nov 9, 2010 at 12:37 PM, Casey McGinty <casey.mcginty@gmail.com> wrote:
> >> Is there any feature in git to perform and auto stash apply/pop when
> >> trying to do a merge/rebase in a dirty working dir? This would save
> >> some keystrokes from time-to-time, and make it easier for new users
> >> unfamiliar with git.
> >
> > And when switching branches too.
>
> Isn't that what "git checkout -m" does?
The problem with checkout -m is that you get only a single shot at
conflict resolution. 'git stash pop' does not drop the stash in the
case of a conflict, so you can try again.
--
Thomas Rast
trast@{inf,student}.ethz.ch
prev parent reply other threads:[~2010-11-09 19:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <AANLkTim3MacQK6EtTPNJsYbqb=5bOM3W3BXC6p=hT+PU@mail.gmail.com>
2010-11-09 5:37 ` Git automatic stashing? Casey McGinty
2010-11-09 7:49 ` Matthieu Moy
2010-11-09 12:02 ` Martin von Zweigbergk
2010-11-09 12:36 ` Nguyen Thai Ngoc Duy
2010-11-09 12:58 ` Martin von Zweigbergk
2010-11-09 19:12 ` Matthieu Moy
2010-11-09 19:19 ` Thomas Rast [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=201011092019.09239.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=casey.mcginty@gmail.com \
--cc=git@vger.kernel.org \
--cc=pclouds@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).