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

Re: [RFC PATCH] Documentation: teach stash/pop workflow instead of stash/apply

From
Sitaram Chamarty <sitaramc@gmail.com>
Date
May 29, 2009, 00:59 UTC
Message-ID
<slrnh1ucqq.6ls.sitaramc@sitaramc.homelinux.net>
In-Reply-To
<ef178b42f4db36811e07f1bca4436ed79e550957.1243502202.git.trast@student.ethz.ch>
On 2009-05-28 09:40:15, Thomas Rast <trast@student.ethz.ch> wrote:
Show 8 quoted lines
> Recent discussion on the list showed some comments in favour of a
> stash/pop workflow:
>
>   http://marc.info/?l=git&m=124234911423358&w=2
>   http://marc.info/?l=git&m=124235348327711&w=2
>
> Change the stash documentation and examples to document pop in its own
> right (and apply in terms of pop), and use stash/pop in the examples.
[snip]
> +Applying the state can fail with conflicts; in this case, it is not
> +removed from the stash list. You need to resolve the conflicts by hand
> +and call `git stash drop` manually afterwards.

For what it is worth, when I take classes on git in $DAYJOB I insist on using only save/pop (and drop when needed as described above). My students are largely freshers with little or no dev experience, and this just seems much more intuitive. Even the aspect of having to drop manually is logical, because something exceptional happened.

I certainly would appreciate this patch, to answer the "RFC" aspect in your subject line.

Previous: Thomas RastNext: Junio C Hamano
Message 12 of 13 in “Showing stash state in bash prompt”
  1. Showing stash state in bash promptDaniel Trstenjak, May 13, 2009
  2. Sverre RabbelierMay 13, 2009
  3. Daniel TrstenjakMay 13, 2009
  4. Junio C HamanoMay 13, 2009
  5. Thomas RastMay 14, 2009
  6. Miles BaderMay 15, 2009
  7. Jeff KingMay 15, 2009
  8. John TapsellMay 15, 2009
  9. Brian GernhardtMay 15, 2009
  10. Miles BaderMay 15, 2009
  11. Documentation: teach stash/pop workflow instead of stash/applyThomas Rast, May 28, 2009
  12. Sitaram ChamartyMay 29, 2009
  13. Junio C HamanoMay 29, 2009

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.