git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Git automatic stashing?

From
Thomas Rast <trast@student.ethz.ch>
Date
Nov 9, 2010, 19:19 UTC
Message-ID
<201011092019.09239.trast@student.ethz.ch>
In-Reply-To
<vpqd3qe8g5j.fsf@bauges.imag.fr>
Matthieu Moy wrote:
Show 11 quoted lines
> 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
Previous: Matthieu Moy
Message 7 of 7 in “Git automatic stashing?”
  1. Casey McGintyNov 9, 2010
  2. Matthieu MoyNov 9, 2010
  3. Martin von ZweigbergkNov 9, 2010
  4. Nguyen Thai Ngoc DuyNov 9, 2010
  5. Martin von ZweigbergkNov 9, 2010
  6. Matthieu MoyNov 9, 2010
  7. Thomas RastNov 9, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.