summaryrefslogtreecommitdiff
path: root/remote.c
diff options
context:
space:
mode:
authorLibravatar Rohit Ashiwal <rohit.ashiwal265@gmail.com>2020-07-13 11:10:41 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-07-13 07:55:37 -0700
commitef484add9f6ba846c62e4f13ebe0ba99b9cc4aa5 (patch)
tree9255aed9eecbd45b7df914b6a5e2e0808bb70044 /remote.c
parentSync with 2.26.2 (diff)
downloadtgif-ef484add9f6ba846c62e4f13ebe0ba99b9cc4aa5.tar.xz
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 'remote.c')
0 files changed, 0 insertions, 0 deletions