On Thu, Oct 12, 2017 at 06:58:49PM +0900, Junio C Hamano wrote:
> "brian m. carlson" writes:
>
> > In the course of that, I'll rebase on top of master so that Junio can
> > avoid as much conflict resolution as possible.
>
> I actually do not mind either way, but by rebasing on top of a more
> re
"brian m. carlson" writes:
> In the course of that, I'll rebase on top of master so that Junio can
> avoid as much conflict resolution as possible.
I actually do not mind either way, but by rebasing on top of a more
recent codebase you can lose a large part of 07/24 IIRC, which would
be a big pl
On Wed, Oct 11, 2017 at 12:05:50PM +0200, Michael Haggerty wrote:
> On 10/09/2017 03:11 AM, brian m. carlson wrote:
> > This is the tenth in a series of patches to convert from unsigned char
> > [20] to struct object_id. This series mostly involves changes to the
> > refs code. After these change
Michael Haggerty writes:
> I took a stab at rebasing this patch series on top of current master
> using `git-imerge`. I pushed the results to my GitHub fork [1] as branch
> `object-id-part-10-rebased`. I didn't check the results very carefully,
> nor whether the commit messages need adjusting, bu
On 10/09/2017 03:11 AM, brian m. carlson wrote:
> This is the tenth in a series of patches to convert from unsigned char
> [20] to struct object_id. This series mostly involves changes to the
> refs code. After these changes, there are almost no references to
> unsigned char in the main refs code
"brian m. carlson" writes:
> This is the tenth in a series of patches to convert from unsigned char
> [20] to struct object_id. This series mostly involves changes to the
> refs code. After these changes, there are almost no references to
> unsigned char in the main refs code.
>
> The series ha
On Sun, Oct 8, 2017 at 6:11 PM, brian m. carlson
wrote:
> This is the tenth in a series of patches to convert from unsigned char
> [20] to struct object_id. This series mostly involves changes to the
> refs code. After these changes, there are almost no references to
> unsigned char in the main
This is the tenth in a series of patches to convert from unsigned char
[20] to struct object_id. This series mostly involves changes to the
refs code. After these changes, there are almost no references to
unsigned char in the main refs code.
The series has not been rebased on master since the l
8 matches
Mail list logo