Merge branch 'js/rebase-i-shortopt'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2018 02:04:59 +0000 (11:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2018 02:04:59 +0000 (11:04 +0900)
"git rebase -i" learned to take 'b' as the short form of 'break'
option in the todo list.

* js/rebase-i-shortopt:
rebase -i: recognize short commands without arguments

1  2 
sequencer.c
t/lib-rebase.sh
t/t3418-rebase-continue.sh
diff --cc sequencer.c
Simple merge
diff --cc t/lib-rebase.sh
index 241f64b09b3773f5a6b35992a40097a298093771,86572438ec7832d96c24012dba7842bceb5a85cf..f6c45ee08f6e348bc7af2939d2bfa65f5c057ae0
@@@ -47,9 -47,9 +47,9 @@@ set_fake_editor () 
        action=pick
        for line in $FAKE_LINES; do
                case $line in
 -              squash|fixup|edit|reword|drop)
 +              pick|squash|fixup|edit|reword|drop)
                        action="$line";;
-               exec*|break)
+               exec*|break|b)
                        echo "$line" | sed 's/_/ /g' >> "$1";;
                "#")
                        echo '# comment' >> "$1";;
Simple merge