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

Re: [PATCH] git-rebase--interactive.sh: Add new command "shell"

From
Kevin Ballard <kevin@sb.org>
Date
Nov 10, 2010, 02:14 UTC
Message-ID
<6F2D0BEA-187E-4683-826C-D8582AC16D8F@sb.org>
In-Reply-To
<20101110015327.GB1503@burratino>
On Nov 9, 2010, at 5:53 PM, Jonathan Nieder wrote:
Show 40 quoted lines
> Junio C Hamano wrote:
>> Yann Dirson <ydirson@free.fr> writes:
> 
>>> #  e, edit = use commit (if specified) but pause to amend/examine/test
> [...]
>>                    would it be crystal clear that, if he changed the insn
>> sheet to
>> 
>>    pick one
>>    edit
>>    pick three
>>    ...
>> 
>> then he will _lose_ the change made by foo, or will the user come back
>> here and complain that a precious change "two" is lost and it is git's
>> fault?
> 
> If we explain it clearly then I think yes, the end user would not
> be confused.
> 
> The above description (that starts with "e, edit") looks more like a
> reminder than a full explanation.  Can we rely on the perplexed
> operator to read the text after the command list?
> 
> If so, some trailing explanation[1] might help.
> 
> # Commands:
> #  p, pick = use commit
> #  r, reword = use commit, but edit the commit message
> #  e, edit = use commit (if specified), but stop to amend/examine/test
> #  s, squash = use commit, but meld into previous commit
> #  f, fixup = like "squash", but discard this commit's log message
> #  x, exec = run command using shell, and stop if it fails
> #
> # The argument to edit is optional; if left out or equal to "-",
> # it means to stop to examine or amend the previous commit.
> #
> # If you remove a line here, THAT COMMIT WILL BE LOST.
> # However, if you remove everything, the rebase will be aborted.
> # Use the noop command if you really want to remove all commits.

I like it. Especially because if we support "-" in place of a sha1, then we can treat the rest of the line like a comment and display it when stopped, as the old "shell" version did.

-Kevin Ballard
Previous: Jonathan NiederNext: Kevin Ballard
Message 32 of 39 in “git-rebase--interactive.sh: Add new command "shell"”
  1. git-rebase--interactive.sh: Add new command "shell"Kevin Ballard, Nov 4, 2010
  2. Kevin BallardNov 4, 2010
  3. Matthieu MoyNov 4, 2010
  4. Kevin BallardNov 4, 2010
  5. Ævar Arnfjörð BjarmasonNov 4, 2010
  6. Kevin BallardNov 4, 2010
  7. Ævar Arnfjörð BjarmasonNov 4, 2010
  8. Johannes SixtNov 4, 2010
  9. Erik Faye-LundNov 4, 2010
  10. Kevin BallardNov 4, 2010
  11. Yann DirsonNov 4, 2010
  12. Erik Faye-LundNov 4, 2010
  13. Eric RaibleNov 4, 2010
  14. Matthieu MoyNov 4, 2010
  15. Eric RaibleNov 4, 2010
  16. Jonathan NiederNov 4, 2010
  17. Yann DirsonNov 4, 2010
  18. Eric RaibleNov 4, 2010
  19. [PATCHv2] git-rebase--interactive.sh: extend "edit" command to be more usefulKevin Ballard, Nov 4, 2010
  20. Kevin BallardNov 4, 2010
  21. Johannes SixtNov 5, 2010
  22. Kevin BallardNov 5, 2010
  23. Junio C HamanoNov 8, 2010
  24. Kevin BallardNov 8, 2010
  25. Yann DirsonNov 8, 2010
  26. Jonathan NiederNov 10, 2010
  27. Kevin BallardNov 10, 2010
  28. Jonathan NiederNov 10, 2010
  29. Yann DirsonNov 10, 2010
  30. Matthieu MoyNov 10, 2010
  31. Jonathan NiederNov 10, 2010
  32. Kevin BallardNov 10, 2010
  33. [PATCHv3] git-rebase--interactive.sh: extend "edit" command to be more usefulKevin Ballard, Nov 24, 2010
  34. Jonathan NiederDec 3, 2010
  35. Kevin BallardDec 3, 2010
  36. Jonathan NiederDec 3, 2010
  37. Johannes SixtDec 3, 2010
  38. Jonathan NiederDec 3, 2010
  39. Kevin BallardDec 3, 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.