Re: MinGW port - initial work uploaded
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 23, 2007, 17:07 UTC
- Message-ID
- <Pine.LNX.4.63.0701231805100.22628@wbgn013.biozentrum.uni-wuerzburg.de>
- In-Reply-To
- <Pine.LNX.4.64.0701230852270.32200@woody.linux-foundation.org>
Hi,
On Tue, 23 Jan 2007, Linus Torvalds wrote:
Show 15 quoted lines
> On Tue, 23 Jan 2007, Johannes Schindelin wrote: > > > > Yes. But it _does_ have a dependency on perl and bash. For example, when > > you merge git-merge-one-file is spawned -- a bash script. > > That's just disgusting. I thought we fixed it, but apparently we only did > so for git-merge-recursive. Hmm? > > All the other uses seem to be just a case of > > git-merge-index -o git-merge-one-file -a > > and wouldn't it be beautiful if the default action for git-merge-index (if > you do _not_ specify a merger program) was to do the simple one-file > three-way merge that we can already do for real merges?
If you think that's a new dream:
http://article.gmane.org/gmane.comp.version-control.git/32046/match=git-merge-one-file
Ciao, Dscho