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

Re: [PATCH 3/3] git-rebase--interactive.sh: Make 3-way merge strategies work for -p.

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Oct 31, 2007, 02:42 UTC
Message-ID
<Pine.LNX.4.64.0710310239100.4362@racer.site>
In-Reply-To
<1193797232-1062-3-git-send-email-B.Steinbrink@gmx.de>
Hi Björn,
On Wed, 31 Oct 2007, Björn Steinbrink wrote:
> +			new_parents=${new_parents# $first_parent}

I wanted to comment that this might not be present in shells other than bash, but I see that we rely on that construct already in am, clone, commit, filter-branch, merge, pull, rebase, stash and submodule.

So I think it's okay.

The whole series is _very_ nicely done, and appears to me as obviously correct.

Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>

Thanks, Dscho

Previous: Björn SteinbrinkNext: Björn Steinbrink
Message 4 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.