diff options
| author | Todd Zullinger <tmz@pobox.com> | 2009-02-28 18:42:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-28 19:47:25 (GMT) |
| commit | 749485f6225455eefd4a2af31e2c98068f20464d (patch) | |
| tree | d7b080aea8488d8847a0968c0ecdc5b58ed72234 /Documentation | |
| parent | 736e619a1be92fcb6eac0155b51bc93d1dcc3157 (diff) | |
| download | git-749485f6225455eefd4a2af31e2c98068f20464d.zip git-749485f6225455eefd4a2af31e2c98068f20464d.tar.gz git-749485f6225455eefd4a2af31e2c98068f20464d.tar.bz2 | |
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 <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 30487de..da3c38c 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -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. |