diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2007-09-07 10:20:50 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-07 21:02:08 -0700 |
| commit | 059f446d57d51fbacdace3fbadf2414916c201dd (patch) | |
| tree | ae61ce466bf44431848578cf165140c4fb163caf /git-rebase.sh | |
| parent | b5ef6ac978012475660a36583b2174e9bd8188a5 (diff) | |
| download | git-059f446d57d51fbacdace3fbadf2414916c201dd.tar.gz git-059f446d57d51fbacdace3fbadf2414916c201dd.tar.xz | |
git-rebase: support --whitespace=<option>
Pass --whitespace=<option> to git-apply. Since git-apply and git-am
expect this, I'm always surprised when I try to give it to git-rebase
and it doesn't work.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 3bd66b0a0..52c686fc8 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -216,8 +216,11 @@ do -v|--verbose) verbose=t ;; + --whitespace=*) + git_am_opt="$git_am_opt $1" + ;; -C*) - git_am_opt=$1 + git_am_opt="$git_am_opt $1" shift ;; -*) |