Please sign in to comment.
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. am's --ignore-space-change (also aliased --ignore-whitespace; see git-apply's description) not only share the same name with diff's --ignore-space-change and merge's -Xignore-space-change, but the similarity in naming appears to have been intentional with am's --ignore-space-change being designed to have the same functionality (see e.g. the commit messages for f008cef ("Merge branch 'jc/apply-ignore-whitespace'", 2014-06-04) and 4e5dd04 ("merge-recursive: options to ignore whitespace chagnes", 2010-08-26)). For the most part, these options do provide the same behaviour. However, there are some edge cases where both apply's --ignore-space-change and merge's -Xignore-space-change fall short of optimal behaviour, and that too in different ways. Fixing these differences in edge cases is left for future work; this patch simply wires the interactive rebase to also understand the --ignore-whitespace flag by translating it to -Xignore-space-change. Signed-off-by: Rohit Ashiwal <email@example.com>
- Loading branch information...
Showing with 36 additions and 6 deletions.