Matthieu Moy wrote:
> Nguyen Thai Ngoc Duy <pclouds@xxxxxxxxx> writes:
>
> > On Tue, Nov 9, 2010 at 12:37 PM, Casey McGinty <casey.mcginty@xxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html