Many editors start in the first line, so the 9-line help text was an annoyance. So move it to the end. Requested by Junio. While at it, add a hint how to abort the rebase. Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> --- On Thu, 22 Nov 2007, Junio C Hamano wrote: > Could we please reorder the lines so that list of initial > "pick"s come first and have the help comment lines at the very > end? How about this? I am hesitant to remove _everything_, since quite a few people seem to be allergic to man pages, so they fire up rebase -i without any clue. git-rebase--interactive.sh | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index a6dc72a..aca2fbb 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -480,20 +480,23 @@ do SHORTHEAD=$(git rev-parse --short $HEAD) SHORTONTO=$(git rev-parse --short $ONTO) cat > "$TODO" << EOF -# Rebasing $SHORTUPSTREAM..$SHORTHEAD onto $SHORTONTO -# +# Rebasing $SHORTUPSTREAM..$SHORTHEAD onto $SHORTONTO (see end for help) +EOF + git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \ + --abbrev=7 --reverse --left-right --cherry-pick \ + $UPSTREAM...$HEAD | \ + sed -n "s/^>/pick /p" >> "$TODO" + cat >> "$TODO" << EOF + # Commands: # pick = use commit # edit = use commit, but stop for amending # squash = use commit, but meld into previous commit # # If you remove a line here THAT COMMIT WILL BE LOST. +# However, if you remove everything, the rebase will be aborted. # EOF - git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \ - --abbrev=7 --reverse --left-right --cherry-pick \ - $UPSTREAM...$HEAD | \ - sed -n "s/^>/pick /p" >> "$TODO" has_action "$TODO" || die_abort "Nothing to do" -- 1.5.3.6.1977.g54d30 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
