From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Nov 2018 02:04:59 +0000 (+0900)
Subject: Merge branch 'js/rebase-i-shortopt'
X-Git-Tag: v2.20.0-rc0~83
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/85fcf1cbb6eb2e8fb1512a5ffe834b6a07deb4cd

Merge branch 'js/rebase-i-shortopt'

"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
---

85fcf1cbb6eb2e8fb1512a5ffe834b6a07deb4cd
diff --cc t/lib-rebase.sh
index 241f64b09b,86572438ec..f6c45ee08f
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@@ -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";;