Petr Baudis <[EMAIL PROTECTED]> :
[...]
> Now you decided to do a little bit of parallel development and stick
> your patches not ready for 2.6.12 to a separate tree. That's fine, do
>
> git fork experimental ~/linux-2.6.experimental
>
> and get some coffee. (It takes about 8 minutes here,
Dear diary, on Tue, Apr 19, 2005 at 07:43:07AM CEST, I got a letter
where bert hubert <[EMAIL PROTECTED]> told me that...
> On Tue, Apr 19, 2005 at 05:51:07AM +0200, Petr Baudis wrote:
> > http://pasky.or.cz/~pasky/dev/git
>
> I pulled the tar.bz2 and did make:
> gcc -g -O3 -Wall -o merge-cach
On Tue, Apr 19, 2005 at 05:51:07AM +0200, Petr Baudis wrote:
> http://pasky.or.cz/~pasky/dev/git
I pulled the tar.bz2 and did make:
gcc -g -O3 -Wall -o merge-cache merge-cache.o libgit.a libgit.a -lssl -lz
gcc -g -O3 -Wall -c -o unpack-file.o unpack-file.c
gcc -g -O3 -Wall -o unpack-file u
Hello,
so I've implemented "true" git merge in git-pasky, using core git's
merging capabilities. It seems to even work. :-)
I tested it briefly, and even did one non-conflicting and one
conflicting merge with Linus with this, but I'd like to hear your
comments
4 matches
Mail list logo
