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>

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 61b1810dbaa56bdc43364ea10d9a5ea0d532f1be..0858fa8a6326a0c457bc9b4bb63ae35d3001ef65 100644 (file)
--- 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]
 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
 'git-rebase' --continue | --skip | --abort
 
 DESCRIPTION


@@ -209,6 +210,10 @@ OPTIONS
        context exist they all must match.  By default no context is
        ever ignored.
 
        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
 -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 3bd66b0a04bac05a3447d68112d4d933480eaf04..52c686fc8c51564d303ddea411dc09265e1222f2 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -216,8 +216,11 @@ do
        -v|--verbose)
                verbose=t
                ;;
        -v|--verbose)
                verbose=t
                ;;

+       --whitespace=*)
+               git_am_opt="$git_am_opt $1"
+               ;;

        -C*)
        -C*)

-               git_am_opt=$1
+               git_am_opt="$git_am_opt $1"

                shift
                ;;
        -*)
                shift
                ;;
        -*)