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

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Johannes Schindelin <Johannes.Schindelin@...>
Cc: <git@...>
Date: Tuesday, October 30, 2007 - 10:53 pm

Hi Dscho,

On 2007.10.31 02:42:03 +0000, Johannes Schindelin wrote:

Actually, I checked first that it's not bash-only (I saw the flames
about that on lkml some time ago, so I've been scared ;-)). Works fine
with dash here and it's in the posix sh specs. See 2.6.2 in
http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html

So I hope that there's a bit of a broader support for it :-)


Thanks :-)

Björn
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 1/3] Fix --strategy parsing in git-rebase--interactiv..., Björn Steinbrink, (Tue Oct 30, 10:20 pm)
[PATCH 2/3] git-rebase--interactive.sh: Don't pass a strateg..., Björn Steinbrink, (Tue Oct 30, 10:20 pm)
[PATCH 3/3] git-rebase--interactive.sh: Make 3-way merge str..., Björn Steinbrink, (Tue Oct 30, 10:20 pm)
Re: [PATCH 3/3] git-rebase--interactive.sh: Make 3-way merge..., Johannes Schindelin, (Tue Oct 30, 10:42 pm)
Re: [PATCH 3/3] git-rebase--interactive.sh: Make 3-way merge..., Björn, (Tue Oct 30, 10:53 pm)