{"thread":{"id":"9816","subject":"[PATCH] git-rebase: support --whitespace=<option>","startedAt":"2007-09-07T14:20:50Z","lastAt":"2007-09-07T14:20:51Z","messageCount":2,"participants":["J. Bruce Fields"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"52911","messageId":"11891748512757-git-send-email-bfields@citi.umich.edu","threadId":"9816","inReplyTo":null,"subject":"[PATCH] git-rebase: support --whitespace=<option>","fromName":"J. Bruce Fields","fromEmail":"bfields@citi.umich.edu","sentAt":"2007-09-07T14:20:50Z","receivedAt":"2007-09-07T14:20:50Z","isPatch":true,"sender":{"key":"bfields@citi.umich.edu","avatar":null},"body":"Pass --whitespace=<option> to git-apply.  Since git-apply and git-am\nexpect this, I'm always surprised when I try to give it to git-rebase\nand it doesn't work.\n\nSigned-off-by: J. Bruce Fields <bfields@citi.umich.edu>\n---\n Documentation/git-rebase.txt |    9 +++++++--\n git-rebase.sh                |    5 ++++-\n 2 files changed, 11 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 61b1810..0858fa8 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -8,8 +8,9 @@ git-rebase - Forward-port local commits to the updated upstream head\n SYNOPSIS\n --------\n [verse]\n-'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge] [-C<n>]\n-\t[-p | --preserve-merges] [--onto <newbase>] <upstream> [<branch>]\n+'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge]\n+\t[-C<n>] [ --whitespace=<option>] [-p | --preserve-merges]\n+\t[--onto <newbase>] <upstream> [<branch>]\n 'git-rebase' --continue | --skip | --abort\n \n DESCRIPTION\n@@ -209,6 +210,10 @@ OPTIONS\n \tcontext exist they all must match.  By default no context is\n \tever ignored.\n \n+--whitespace=<nowarn|warn|error|error-all|strip>::\n+\tThis flag is passed to the `git-apply` program\n+\t(see gitlink:git-apply[1]) that applies the patch.\n+\n -i, \\--interactive::\n \tMake a list of the commits which are about to be rebased.  Let the\n \tuser edit that list before rebasing.  This mode can also be used to\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 3bd66b0..52c686f 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -216,8 +216,11 @@ do\n \t-v|--verbose)\n \t\tverbose=t\n \t\t;;\n+\t--whitespace=*)\n+\t\tgit_am_opt=\"$git_am_opt $1\"\n+\t\t;;\n \t-C*)\n-\t\tgit_am_opt=$1\n+\t\tgit_am_opt=\"$git_am_opt $1\"\n \t\tshift\n \t\t;;\n \t-*)\n-- \n1.5.3\n"},{"id":"52912","messageId":"11891748511401-git-send-email-bfields@citi.umich.edu","threadId":"9816","inReplyTo":"11891748512757-git-send-email-bfields@citi.umich.edu","subject":"[PATCH] git-rebase: fix -C option","fromName":"J. Bruce Fields","fromEmail":"bfields@citi.umich.edu","sentAt":"2007-09-07T14:20:51Z","receivedAt":"2007-09-07T14:20:51Z","isPatch":true,"sender":{"key":"bfields@citi.umich.edu","avatar":null},"body":"The extra shift here causes failure to parse any commandline including\nthe -C option.\n\nSigned-off-by: J. Bruce Fields <bfields@citi.umich.edu>\n---\n git-rebase.sh |    1 -\n 1 files changed, 0 insertions(+), 1 deletions(-)\n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 52c686f..c9942f2 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -221,7 +221,6 @@ do\n \t\t;;\n \t-C*)\n \t\tgit_am_opt=\"$git_am_opt $1\"\n-\t\tshift\n \t\t;;\n \t-*)\n \t\tusage\n-- \n1.5.3\n"}]}