• R
    rebase -i: add --ignore-whitespace flag · ef484add
    Rohit Ashiwal 提交于
    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: NRohit Ashiwal <rohit.ashiwal265@gmail.com>
    Signed-off-by: NPhillip Wood <phillip.wood@dunelm.org.uk>
    Signed-off-by: NJunio C Hamano <gitster@pobox.com>
    ef484add
rebase.c 67.5 KB