On 2008-07-07 21:54:01 +0100, Catalin Marinas wrote:
> 2008/7/4 Karl Hasselström <kha@xxxxxxxxxxx>:
>
> > In this one, I've just removed the --undo flag from sync without
> > adding anything back. Still undetermined if that's OK.
>
> I think it should be ok (see the other thread). Anyway, have you
> heard of anyone else using sync apart from me?
No, I haven't.
I've tried to understand what it does, and as far as I can tell it
doesn't do quite what I want. (What I want is the ability to 3-way
merge StGit patch stacks, so that I can modify the same patch stack in
several places and merge back and forth. From what I recall, the sync
command is more like a 2-way merge -- that is, it doesn't take the
last common ancestor into account. But it's been a while since I
studied it.)
--
Karl Hasselström, kha@xxxxxxxxxxx
www.treskal.com/kalle
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
