diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-08-21 18:47:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-21 18:47:48 -0700 |
| commit | 5e092b5bcea48c098af7000f888a2a0f16c9db77 (patch) | |
| tree | a7f8635ab1ad5542201d8d46f39d4672d3bd87b9 /git-rebase.sh | |
| parent | Merge branch 'bc/mailsplit-cr-at-eol' (diff) | |
| parent | git apply: option to ignore whitespace differences (diff) | |
| download | tgif-5e092b5bcea48c098af7000f888a2a0f16c9db77.tar.xz | |
Merge branch 'gb/apply-ignore-whitespace'
* gb/apply-ignore-whitespace:
git apply: option to ignore whitespace differences
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 3555d17a5d..2315d95a9f 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -333,6 +333,9 @@ do ;; esac ;; + --ignore-whitespace) + git_am_opt="$git_am_opt $1" + ;; --committer-date-is-author-date|--ignore-date) git_am_opt="$git_am_opt $1" force_rebase=t |