git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 1/3] Fix --strategy parsing in git-rebase--interactive.sh

From
Björn Steinbrink <b.steinbrink@gmx.de>
Date
Oct 31, 2007, 02:20 UTC
Message-ID
<1193797232-1062-1-git-send-email-B.Steinbrink@gmx.de>

For the --strategy/-s option, git-rebase--interactive.sh dropped the parameter which it was trying to parse.

Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 0dd77b4..f667ae8 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -387,7 +387,6 @@ do
 		output git reset --hard && do_rest
 		;;
 	-s|--strategy)
-		shift
 		case "$#,$1" in
 		*,*=*)
 			STRATEGY="-s `expr "z$1" : 'z-[^=]*=\(.*\)'`" ;;
-- 
1.5.3.4.456.g072a
Next: Björn Steinbrink
Message 1 of 5 in “Fix --strategy parsing in git-rebase--interactive.sh”
  1. 1/3 Fix --strategy parsing in git-rebase--interactive.shBjörn Steinbrink, Oct 31, 2007
  2. 2/3 git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.Björn Steinbrink, Oct 31, 2007
  3. 3/3 git-rebase--interactive.sh: Make 3-way merge strategies work for -p.Björn Steinbrink, Oct 31, 2007
  4. Johannes SchindelinOct 31, 2007
  5. Björn SteinbrinkOct 31, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.