diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-22 01:47:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-22 01:47:48 (GMT) |
| commit | 5e092b5bcea48c098af7000f888a2a0f16c9db77 (patch) | |
| tree | a7f8635ab1ad5542201d8d46f39d4672d3bd87b9 /Documentation/git-rebase.txt | |
| parent | bcd45e27d8790d8981d4c6734bc573363121efd3 (diff) | |
| parent | 86c91f91794cd6af8e19fbe68ab283d567d2b66f (diff) | |
| download | git-5e092b5bcea48c098af7000f888a2a0f16c9db77.zip git-5e092b5bcea48c098af7000f888a2a0f16c9db77.tar.gz git-5e092b5bcea48c098af7000f888a2a0f16c9db77.tar.bz2 | |
Merge branch 'gb/apply-ignore-whitespace'
* gb/apply-ignore-whitespace:
git apply: option to ignore whitespace differences
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index db1b71d..0aefc34 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -268,8 +268,9 @@ OPTIONS exit with the message "Current branch is up to date" in such a situation. +--ignore-whitespace:: --whitespace=<option>:: - This flag is passed to the 'git-apply' program + These flag are passed to the 'git-apply' program (see linkgit:git-apply[1]) that applies the patch. Incompatible with the --interactive option. |