Merge functions (in progress) #63

Merged
jezell merged 17 commits from jezell/merge into master 2014-04-26 13:42:18 -05:00
jezell commented 2014-02-28 03:34:34 -06:00 (Migrated from github.com)
No description provided.
carlosmn commented 2014-03-20 01:00:51 -05:00 (Migrated from github.com)

As a heads-up, libgit2/libgit2#2183 is going to change the API from trying to copy badly designed git porcelain to something much saner.

As a heads-up, libgit2/libgit2#2183 is going to change the API from trying to copy badly designed git porcelain to something much saner.
jezell commented 2014-03-20 01:29:53 -05:00 (Migrated from github.com)

Oh nice! Merging soon?

Oh nice! Merging soon?
carlosmn commented 2014-03-20 02:53:54 -05:00 (Migrated from github.com)

Yeah, it shouldn't take too long now. Mostly waiting for people to agree we should merge it.

Yeah, it shouldn't take too long now. Mostly waiting for people to agree we should merge it.
carlosmn commented 2014-03-25 06:53:41 -05:00 (Migrated from github.com)

The merge refactoring changes have been merged in libgit2.

The merge refactoring changes have been merged in libgit2.
jezell commented 2014-03-25 09:50:57 -05:00 (Migrated from github.com)

Great I'll get to work on updating

On Mar 25, 2014, at 4:53 AM, Carlos Martín Nieto notifications@github.com wrote:

The merge refactoring changes have been merged in libgit2.


Reply to this email directly or view it on GitHub.

Great I'll get to work on updating > On Mar 25, 2014, at 4:53 AM, Carlos Martín Nieto notifications@github.com wrote: > > The merge refactoring changes have been merged in libgit2. > > — > Reply to this email directly or view it on GitHub.
Sign in to join this conversation.
No reviewers
No Milestone
No project
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: jcarr/git2go#63
No description provided.