Thread (9 messages) flat view 9 messages, 6 authors, 2016-06-15

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

From: Yann Dirson <hidden>
Date: 2016-06-15 22:49:58

Possibly related (same subject, not in this thread)

On Thu, Nov 04, 2010 at 01:10:20PM -0500, Jonathan Nieder wrote:
How about:

# Commands:
#  p, pick = use commit
#  r, reword = use commit, but edit the commit message
#  e, edit = use commit, but stop for amending
#  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, 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.
That may be too far from the "edit" line, although I do like the idea
of mentionning other uses than "amend".

Eric Raible suggested:
How about:

#  e [<commit>], edit [<commit>] = use commit (if present) but pause to amend
Other commands do not mention commit (or other things) as a synopsis would.
What about:

#  e, edit = use commit (if specified) but pause to amend/examine/test
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help