Skip to content

Commit

Permalink
git-rebase: Update --whitespace documentation
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
tmzullinger authored and gitster committed Feb 28, 2009
1 parent 736e619 commit 749485f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Documentation/git-rebase.txt
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ OPTIONS
context exist they all must match. By default no context is
ever ignored.

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

0 comments on commit 749485f

Please sign in to comment.