diff options
| author | Rohit Ashiwal <rohit.ashiwal265@gmail.com> | 2019-11-01 19:29:58 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-02 15:34:50 +0900 |
| commit | ba51d2fb24b1a41b8cc15270a06f24c35c0fcf19 (patch) | |
| tree | 5e2e5df2b87f8ff3d0a6a80adfd88234529833c1 /Documentation/git-rebase.txt | |
| parent | b0a3186140dbc7bd64cbc6ef733386a0f1eb6a4d (diff) | |
| download | git-ba51d2fb24b1a41b8cc15270a06f24c35c0fcf19.tar.gz | |
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 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 5e4e927647..a70a5cab26 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -371,8 +371,16 @@ If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`. --ignore-whitespace:: + Behaves differently depending on which backend is selected. ++ +'am' backend: When applying a patch, ignore changes in whitespace in +context lines if necessary. ++ +'interactive' backend: Treat lines with only whitespace changes as +unchanged for the sake of a three-way merge. + --whitespace=<option>:: - These flag are passed to the 'git apply' program + This flag is passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. + See also INCOMPATIBLE OPTIONS below. @@ -520,7 +528,6 @@ The following options: * --committer-date-is-author-date * --ignore-date * --whitespace - * --ignore-whitespace * -C are incompatible with the following options: @@ -543,6 +550,7 @@ In addition, the following pairs of options are incompatible: * --preserve-merges and --interactive * --preserve-merges and --signoff * --preserve-merges and --rebase-merges + * --preserve-merges and --ignore-whitespace * --rebase-merges and --strategy * --rebase-merges and --strategy-option |