summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 736e619)
raw | patch | inline | side by side (parent: 736e619)
author | Todd Zullinger <tmz@pobox.com> | |
Sat, 28 Feb 2009 18:42:02 +0000 (13:42 -0500) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 28 Feb 2009 19:47:25 +0000 (11:47 -0800) |
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 <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.txt | patch | blob | history |
index 30487de48fa83aa63b83043e090053c07c54456a..da3c38cd60dc0d143fe91417b742335cfff27809 100644 (file)
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.