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

Re: [PATCH 4/6] stash: introduce 'git stash store'

From
Junio C Hamano <gitster@pobox.com>
Date
May 13, 2013, 18:35 UTC
Message-ID
<7vli7in2wq.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CALkWK0nmDopEVArofKt42u5JHRBXmGiHP051jhMxtaihWLu95A@mail.gmail.com>
Ramkumar Ramachandra <artagnon@gmail.com> writes:
Show 7 quoted lines
>   git-merge --stat --progress "$merge_name" HEAD 04c5b83c46760573
>
> We made a design mistake at the command-level in merge.  This is at a
> subcommand-level.
>
> 1. Will git stash store ever be more than a one-liner?  Can you think
> of how this function could be larger?
That is not a valid question.  When Linus added the original
    git merge 'message' HEAD $other_branch

there wasn't any merge strategy switch and all the other frills even envisioned yet. With what we know about Git today, even you could have answered "Will git merge be more involved compared to the original?" 8 years ago, but without that, not even Linus nor I did anticipate that the command line interface would become a pain point when enhancing it.

Previous: Ramkumar RamachandraNext: Ramkumar Ramachandra
Message 14 of 21 in “Get stash to help rebase.autostash”
  1. 0/6 Get stash to help rebase.autostashRamkumar Ramachandra, May 13, 2013
  2. 1/6 Documentation/stash: correct synopsis for createRamkumar Ramachandra, May 13, 2013
  3. 2/6 Documentation/stash: document short form -p in synopsisRamkumar Ramachandra, May 13, 2013
  4. 3/6 stash: simplify option parser for createRamkumar Ramachandra, May 13, 2013
  5. Junio C HamanoMay 13, 2013
  6. Ramkumar RamachandraMay 13, 2013
  7. 4/6 stash: introduce 'git stash store'Ramkumar Ramachandra, May 13, 2013
  8. Junio C HamanoMay 13, 2013
  9. Ramkumar RamachandraMay 13, 2013
  10. Junio C HamanoMay 13, 2013
  11. Ramkumar RamachandraMay 13, 2013
  12. Junio C HamanoMay 13, 2013
  13. Ramkumar RamachandraMay 13, 2013
  14. Junio C HamanoMay 13, 2013
  15. Ramkumar RamachandraMay 13, 2013
  16. Junio C HamanoMay 13, 2013
  17. Ramkumar RamachandraMay 13, 2013
  18. Ramkumar RamachandraMay 13, 2013
  19. 5/6 stash: tweak error message in store_stash ()Ramkumar Ramachandra, May 13, 2013
  20. Junio C HamanoMay 13, 2013
  21. 6/6 rebase: use 'git stash store' to simplify logicRamkumar Ramachandra, May 13, 2013

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.