diff options
| author | Rohit Ashiwal <rohit.ashiwal265@gmail.com> | 2019-11-01 16:59:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-02 09:34:50 +0300 |
| commit | ba51d2fb24b1a41b8cc15270a06f24c35c0fcf19 (patch) | |
| tree | 5e2e5df2b87f8ff3d0a6a80adfd88234529833c1 /t/t3422-rebase-incompatible-options.sh | |
| parent | b0a3186140dbc7bd64cbc6ef733386a0f1eb6a4d (diff) | |
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>
Diffstat (limited to 't/t3422-rebase-incompatible-options.sh')
| -rwxr-xr-x | t/t3422-rebase-incompatible-options.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh index a5868ea152..4342f79eea 100755 --- a/t/t3422-rebase-incompatible-options.sh +++ b/t/t3422-rebase-incompatible-options.sh @@ -61,7 +61,6 @@ test_rebase_am_only () { } test_rebase_am_only --whitespace=fix -test_rebase_am_only --ignore-whitespace test_rebase_am_only --committer-date-is-author-date test_rebase_am_only -C4 |