[PATCH 0/2] rebase -i: in-editor documentation nits

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Jan 16, 2011, 01:59 UTC
Message-ID: <20110116015941.GA28137@burratino>
In-Reply-To: <1281453472-29835-1-git-send-email-Matthieu.Moy@imag.fr>

Matthieu Moy wrote:

Show 9 quoted lines

> +++ b/git-rebase--interactive.sh
> @@ -957,6 +988,7 @@ first and then run 'git rebase --continue' again."
>  #  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 <cmd>, exec <cmd> = Run a shell command <cmd>, and stop if it fails
>  #
>  # If you remove a line here THAT COMMIT WILL BE LOST.
>  # However, if you remove everything, the rebase will be aborted.

Nit: the "exec" command is formatted differently from the commands
around it, making it stand out (which I don't think is intended).

While we're there, patch 2 adds some brief documentation for the "noop" command.

Roughly based on [1] (which might be a nice patch to revive, by the way). Sane?

Jonathan Nieder (2):
  rebase -i: reword in-editor documentation of "exec"
  rebase -i: explain how to discard all commits

 git-rebase--interactive.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

[1] http://thread.gmane.org/gmane.comp.version-control.git/161120/focus=162079