@matheusbsbs / matheus-bagliano / commits / 059f446d57
Fork 0

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>

J. Bruce Fields committed Sep 7, 2007 at 10:20 UTC 059f446d57d51fbacdace3fbadf2414916c201dd
2 files changed +11 -3
Documentation/git-rebase.txt
+7 -2
@@ -8,8 +8,9 @@ git-rebase - Forward-port local commits to the updated upstream head
8 SYNOPSIS
9 --------
10 [verse]
11 -'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge] [-C<n>]
12 - [-p | --preserve-merges] [--onto <newbase>] <upstream> [<branch>]
11 +'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge]
12 + [-C<n>] [ --whitespace=<option>] [-p | --preserve-merges]
13 + [--onto <newbase>] <upstream> [<branch>]
14 'git-rebase' --continue | --skip | --abort
15
16 DESCRIPTION
@@ -209,6 +210,10 @@ OPTIONS
210 context exist they all must match. By default no context is
211 ever ignored.
212
213 +--whitespace=<nowarn|warn|error|error-all|strip>::
214 + This flag is passed to the `git-apply` program
215 + (see gitlink:git-apply[1]) that applies the patch.
216 +
217 -i, \--interactive::
218 Make a list of the commits which are about to be rebased. Let the
219 user edit that list before rebasing. This mode can also be used to
git-rebase.sh
+4 -1
@@ -216,8 +216,11 @@ do
216 -v|--verbose)
217 verbose=t
218 ;;
219 + --whitespace=*)
220 + git_am_opt="$git_am_opt $1"
221 + ;;
222 -C*)
220 - git_am_opt=$1
223 + git_am_opt="$git_am_opt $1"
224 shift
225 ;;
226 -*)