Re: [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear)

Hi Jake, Jacob Keller writes: > On Fri, Feb 16, 2018 at 5:08 AM, Sergey Organov wrote: >> Hi, >> >> By accepting the challenges raised in recent discussion of advanced >> support for history rebasing and editing in Git, I hopefully figured out >> a

Draft of Git Rev News edition 36

Hi, A draft of a new Git Rev News edition is available here: https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-36.md Everyone is welcome to contribute in any section either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub

GSoC 2018: Git has been accepted as a mentor organization!

Hi, Just a quick message to let everyone know that Git has been accepted as a mentor organization for the Google Summer of Code 2018. If anyone wants to mentor or co-mentor, that is still possible. Just let us know so that we can invite you to register on the GSoC web site. Dscho, I just sent

Re: [PATCH v3 22/23] cat-file: tests for new atoms added

On 18/02/18 22:55, Ramsay Jones wrote: > > > On 16/02/18 14:55, Adam Dinwoodie wrote: >> On 12 February 2018 at 08:08, Olga Telezhnaya wrote: >>> Add some tests for new formatting atoms from ref-filter. >>> Some of new atoms are supported automatically, >>> some of them are expanded into empty

Re: [PATCH v3 22/23] cat-file: tests for new atoms added

On 16/02/18 14:55, Adam Dinwoodie wrote: > On 12 February 2018 at 08:08, Olga Telezhnaya wrote: >> Add some tests for new formatting atoms from ref-filter. >> Some of new atoms are supported automatically, >> some of them are expanded into empty string >> (because they are useless for some types

Re: [PATCH] sq_dequote: fix extra consumption of source string

On Wed, Feb 14, 2018 at 12:41 AM, Jeff King wrote: > This fixes a (probably harmless) parsing problem in > sq_dequote_step(), in which we parse some bogus input > incorrectly rather than complaining that it's bogus. > [...] LGTM. Thanks for taking care of this. Michael