diff options
| author | Rohit Ashiwal <rohit.ashiwal265@gmail.com> | 2020-07-13 10:10:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-13 14:55:37 (GMT) |
| commit | ef484add9f6ba846c62e4f13ebe0ba99b9cc4aa5 (patch) | |
| tree | 9255aed9eecbd45b7df914b6a5e2e0808bb70044 /t/t3422-rebase-incompatible-options.sh | |
| parent | 048abe1751e6727bfbacf7b80466d78e04631f94 (diff) | |
| download | git-ef484add9f6ba846c62e4f13ebe0ba99b9cc4aa5.zip git-ef484add9f6ba846c62e4f13ebe0ba99b9cc4aa5.tar.gz git-ef484add9f6ba846c62e4f13ebe0ba99b9cc4aa5.tar.bz2 | |
rebase -i: add --ignore-whitespace flag
Rebase is implemented with two different backends - 'apply' and
'merge' each of which support a different set of options. In
particular the apply backend supports a number of options implemented
by 'git am' that are not implemented in the merge backend. This means
that the available options are different depending on which backend is
used which is confusing. This patch adds support for the
--ignore-whitespace option to the merge backend. This option treats
lines with only whitespace changes as unchanged and is implemented in
the merge backend by translating it to -Xignore-space-change.
Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
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 50e7960..55ca467 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 |