Re: [libposix-development] My personal development branch

[Henrique A. <hd...@gm...>]

 With git pull, I'm not being able to merge each commit individually in my
branch:

 commit 3c75fe8dccc28d9011bb8f5a548db0778eae54cd
Merge: 1faac1a... 05b56ea...
Author: Henrique <hd...@us...>
Date:   Sat Jun 6 17:29:37 2009 -0300

    Merge git://github.com/akrennmair/libposix into andreas

    * git://github.com/akrennmair/libposix:
      implemented abs(), labs() and llabs() including unit tests.
      implemented strrchr() including unit tests.
      fixed build dependencies for tests.
      added unit tests for already implemented str* functions.
      added mmap and munmap.
      added simple unit tests for already implemented mem* functions.

 Is there a way to fix this ?

2009/6/5 Henrique Almeida <hd...@gm...>

>
>  Ok, good idea, git branches rock !
>
> 2009/6/5 Andreas Krennmair <akr...@go...>
>
>> Hello everybody,
>>
>> As the "broken" branch didn't work out as expected, I found a better way
>> that both satisfies me in its abilities and also allows other developers to
>> easily see and merge my changes. I have a fork of libposix uploaded on
>> GitHub: http://github.com/akrennmair/libposix/tree/master
>> In this fork, I will regularly keep track of changes in the official
>> libposix git repository. But it's also simple to merge my commits into the
>> official libposix repository by executing
>> git pull git://github.com/akrennmair/libposix.git master
>> in a clone of the official libposix git repository. Anyway, GitHub is the
>> place to see and track my changes. Of course, this shall NOT be interpreted
>> as a way to get independent from the official project, it is merely a way
>> that helps me work in a more flexible fashion on the things that I want to
>> work on, plus it makes my changes more visible and also easier to
>> reintegrate with the official development line.
>>
>> Nevertheless, I will continue posting short notifications about the things
>> I currently work on to keep everyone informed. So far, I've worked on some
>> simple functions including unit tests, and I hope to present a simple
>> implementation of malloc(), free(), realloc() and calloc() within a day or
>> two.
>>
>> Regards,
>> Andreas
>>
>>
>> ------------------------------------------------------------------------------
>> OpenSolaris 2009.06 is a cutting edge operating system for enterprises
>> looking to deploy the next generation of Solaris that includes the latest
>> innovations from Sun and the OpenSource community. Download a copy and
>> enjoy capabilities such as Networking, Storage and Virtualization.
>> Go to: http://p.sf.net/sfu/opensolaris-get
>> _______________________________________________
>> Libposix-development mailing list
>> Lib...@li...
>> https://lists.sourceforge.net/lists/listinfo/libposix-development
>>
>>
>
>
> --
> Henrique Dante de Almeida
> hd...@gm...
>



-- 
Henrique Dante de Almeida
hd...@gm...