diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-06 15:50:22 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-06 15:50:22 +0900 |
| commit | b3635c15b504a0bb73b12669382fb9b8248b6d58 (patch) | |
| tree | a9a8b2b6e8c5ffd4387d5360fda3a16c9946cb2d /t/lib-rebase.sh | |
| parent | 1f8e7dc4da901c33b52ea632ab651838abfb4864 (diff) | |
| parent | 8c64bc942056eeb5eab467e1f99394f66be0796a (diff) | |
| download | git-b3635c15b504a0bb73b12669382fb9b8248b6d58.tar.gz | |
Merge branch 'sg/test-rebase-editor-fix'
* sg/test-rebase-editor-fix:
t3404-rebase-interactive: test abbreviated commands
Diffstat (limited to 't/lib-rebase.sh')
| -rw-r--r-- | t/lib-rebase.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index f6c45ee08f..7ea30e5006 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -47,9 +47,9 @@ set_fake_editor () { action=pick for line in $FAKE_LINES; do case $line in - pick|squash|fixup|edit|reword|drop) + pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d) action="$line";; - exec*|break|b) + exec_*|x_*|break|b) echo "$line" | sed 's/_/ /g' >> "$1";; "#") echo '# comment' >> "$1";; |