Skip to content

Commit 749485f

Browse files
tmzullingergitster
authored andcommitted
git-rebase: Update --whitespace documentation
The parameters accepted by the --whitespace option of "git apply" have changed over time, and the documentation for "git rebase" was out of sync. Remove the specific parameter list from the "git rebase" documentation and simply point to the "git apply" documentation for details, as is already done in the "git am" documentation. Signed-off-by: Todd Zullinger <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 736e619 commit 749485f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/git-rebase.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ OPTIONS
243243
context exist they all must match. By default no context is
244244
ever ignored.
245245

246-
--whitespace=<nowarn|warn|error|error-all|strip>::
246+
--whitespace=<option>::
247247
This flag is passed to the 'git-apply' program
248248
(see linkgit:git-apply[1]) that applies the patch.
249249
Incompatible with the --interactive option.

0 commit comments

Comments
 (0)