]> git.ipfire.org Git - thirdparty/git.git/commit - t/t3433-rebase-options-compatibility.sh
rebase -i: add --ignore-whitespace flag
authorRohit Ashiwal <rohit.ashiwal265@gmail.com>
Fri, 1 Nov 2019 13:59:58 +0000 (19:29 +0530)
committerJunio C Hamano <gitster@pobox.com>
Sat, 2 Nov 2019 06:34:50 +0000 (15:34 +0900)
commitba51d2fb24b1a41b8cc15270a06f24c35c0fcf19
tree5e2e5df2b87f8ff3d0a6a80adfd88234529833c1
parentb0a3186140dbc7bd64cbc6ef733386a0f1eb6a4d
rebase -i: add --ignore-whitespace flag

There are two backends available for rebasing, viz, the am and the
interactive. Naturally, there shall be some features that are
implemented in one but not in the other. One such flag is
--ignore-whitespace which indicates merge mechanism to treat lines
with only whitespace changes as unchanged. Wire the interactive
rebase to also understand the --ignore-whitespace flag by
translating it to -Xignore-space-change.

Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.txt
builtin/rebase.c
t/t3422-rebase-incompatible-options.sh
t/t3433-rebase-options-compatibility.sh [new file with mode: 0755]