Re: [PATCH] A new merge algorithm, take 2

2005-08-28 Thread Junio C Hamano
Fredrik Kuivinen <[EMAIL PROTECTED]> writes: > I didn't know you could do things like that with git-ls-files :) But > yeah, it's certainly less intrusive to do it that way. It will > probably simplify things a great deal too. Wouldn't '--unmerged' be > the appropriate flag to use for git-ls-files

Re: [PATCH] A new merge algorithm, take 2

2005-08-28 Thread Fredrik Kuivinen
On Sat, Aug 27, 2005 at 10:23:23PM -0700, Junio C Hamano wrote: > Fredrik Kuivinen <[EMAIL PROTECTED]> writes: > > > The main changes compared to the previous version are: > > > > * Lots of clean up. > > * Some of the scripts have been renamed to better match the naming > > convention used in Gi

Re: [PATCH] A new merge algorithm, take 2

2005-08-27 Thread Junio C Hamano
Fredrik Kuivinen <[EMAIL PROTECTED]> writes: > The main changes compared to the previous version are: > > * Lots of clean up. > * Some of the scripts have been renamed to better match the naming > convention used in Git. > * A new option ('-s') has been added to git-merge-cache > * Unclean merge

[PATCH] A new merge algorithm, take 2

2005-08-27 Thread Fredrik Kuivinen
Hi, I have cleaned up the code for the merge algorithm quite a lot. It is in a much better shape now. The main changes compared to the previous version are: * Lots of clean up. * Some of the scripts have been renamed to better match the naming convention used in Git. * A new option ('-s') has