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 | |
| 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>
| -rw-r--r-- | Documentation/git-rebase.txt | 9 | ||||
| -rwxr-xr-x | git-rebase.sh | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 61b1810db..0858fa8a6 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -8,8 +8,9 @@ git-rebase - Forward-port local commits to the updated upstream head SYNOPSIS -------- [verse] -'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge] [-C<n>] - [-p | --preserve-merges] [--onto <newbase>] <upstream> [<branch>] +'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge] + [-C<n>] [ --whitespace=<option>] [-p | --preserve-merges] + [--onto <newbase>] <upstream> [<branch>] 'git-rebase' --continue | --skip | --abort DESCRIPTION @@ -209,6 +210,10 @@ OPTIONS context exist they all must match. By default no context is ever ignored. +--whitespace=<nowarn|warn|error|error-all|strip>:: + This flag is passed to the `git-apply` program + (see gitlink:git-apply[1]) that applies the patch. + -i, \--interactive:: Make a list of the commits which are about to be rebased. Let the user edit that list before rebasing. This mode can also be used to 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 ;; -*) |