git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Re*: AW: Getting the full path of a conflicting file within a custom merge driver?

From
Christian Couder <christian.couder@gmail.com>
Date
Jun 5, 2015, 08:07 UTC
Message-ID
<CAP8UFD0cJoh2YrxD-Cjr-r37SGDOcy=VafETAN4suxS0HVa6sA@mail.gmail.com>
In-Reply-To
<D8780C527EB1E642B3150E6D705B46D468839F73@DWPWHMS531.dwpbank.local>

On Fri, Jun 5, 2015 at 7:56 AM, Gondek, Andreas <Andreas.Gondek@dwpbank.de> wrote:

> Thanks, thanks, thanks.
>
> One last question. If I don't want to compile Git myself, how long may the pu branch take approx. to get into a next release?
According to:
https://github.com/git/git/blob/master/Documentation/howto/maintain-git.txt

"One release cycle for a feature release is expected to last for eight to ten weeks."

As v2.4.2 was tagged on May 26, the next feature release should be in 6 to 9 weeks, and will hopefully include the feature you are interested in.

(Also please don't top post on this list.)

Best, Christian.

Previous: Gondek, AndreasNext: Christian Couder
Message 7 of 9 in “Getting the full path of a conflicting file within a custom merge driver?”
  1. Gondek, AndreasJun 1, 2015
  2. Junio C HamanoJun 1, 2015
  3. AW: Getting the full path of a conflicting file within a custom merge driver?Gondek, Andreas, Jun 2, 2015
  4. Junio C HamanoJun 2, 2015
  5. Re*: AW: Getting the full path of a conflicting file within a custom merge driver?Junio C Hamano, Jun 4, 2015
  6. AW: Re*: AW: Getting the full path of a conflicting file within a custom merge driver?Gondek, Andreas, Jun 5, 2015
  7. Christian CouderJun 5, 2015
  8. Christian CouderJun 5, 2015
  9. Junio C HamanoJun 5, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.