diff options
author | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2009-08-04 13:16:49 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-08-05 11:59:56 -0700 |
commit | 86c91f91794cd6af8e19fbe68ab283d567d2b66f (patch) | |
tree | 2a8f3476997717ddf57d6dadd2c553461028d409 /Documentation/git-rebase.txt | |
parent | 07a4a3b4962e1fd4e40fd877427cddd7428c1bc3 (diff) | |
download | git-86c91f91794cd6af8e19fbe68ab283d567d2b66f.tar.gz |
git apply: option to ignore whitespace differences
Introduce --ignore-whitespace option and corresponding config bool to
ignore whitespace differences while applying patches, akin to the
'patch' program.
'git am', 'git rebase' and the bash git completion are made aware of
this option.
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 db1b71d248..0aefc34d0d 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. |