diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-11-22 12:30:10 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-22 23:35:06 (GMT) |
| commit | 6047a234c5a6aef58c72a35feba326484f07660d (patch) | |
| tree | d9bc20c08e285715ec074b96fdd5d90beb201fa6 /t | |
| parent | a00a42ae33708caa742d9e9fbf10692cfa42f032 (diff) | |
| download | git-6047a234c5a6aef58c72a35feba326484f07660d.zip git-6047a234c5a6aef58c72a35feba326484f07660d.tar.gz git-6047a234c5a6aef58c72a35feba326484f07660d.tar.bz2 | |
rebase -i: move help to end of todo file
[PATCH] rebase -i: move help to end of todo file
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@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index f1039d1..907c7f9 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -149,7 +149,8 @@ test_expect_success 'stop on conflicting pick' ' diff -u expect .git/.dotest-merge/patch && diff -u expect2 file1 && test 4 = $(grep -v "^#" < .git/.dotest-merge/done | wc -l) && - test 0 = $(grep -v "^#" < .git/.dotest-merge/git-rebase-todo | wc -l) + test 0 = $(grep -ve "^#" -e "^$" < .git/.dotest-merge/git-rebase-todo | + wc -l) ' test_expect_success 'abort' ' |