summaryrefslogtreecommitdiff
path: root/mergetools/diffmerge
diff options
context:
space:
mode:
authorLibravatar Johannes Sixt <j6t@kdbg.org>2018-10-25 22:47:45 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-26 10:20:23 +0900
commit3a4a4cab3ef024e10af7a5bbcaed4b961c60f1db (patch)
tree845fa7bba14ed40fbc833f3f7a999a684ffd1557 /mergetools/diffmerge
parentrebase -i: introduce the 'break' command (diff)
downloadtgif-3a4a4cab3ef024e10af7a5bbcaed4b961c60f1db.tar.xz
rebase -i: recognize short commands without arguments
The sequencer instruction 'b', short for 'break', is rejected: error: invalid line 2: b The reason is that the parser expects all short commands to have an argument. Permit short commands without arguments. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/diffmerge')
0 files changed, 0 insertions, 0 deletions