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

2015-06-05 Thread Christian Couder
On Fri, Jun 5, 2015 at 7:56 AM, Gondek, Andreas andreas.gon...@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:

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

2015-06-05 Thread Christian Couder
On Fri, Jun 5, 2015 at 10:07 AM, Christian Couder christian.cou...@gmail.com wrote: On Fri, Jun 5, 2015 at 7:56 AM, Gondek, Andreas andreas.gon...@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

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

2015-06-05 Thread Junio C Hamano
Gondek, Andreas andreas.gon...@dwpbank.de writes: 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? There is no general estimate; not all topics necessarily graduate to the released version. I'd leave it on the list

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

2015-06-04 Thread Gondek, Andreas
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? Mit freundlichen Grüßen Andreas Gondek Applications Deutsche WertpapierService Bank AG ITTAS Derendorfer Allee

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

2015-06-04 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Gondek, Andreas andreas.gon...@dwpbank.de writes: thank you for responding this fast. I would suggest providing this information as an additional parameter (like %A %O %B and %L) maybe %P. Yes, per-cent plus a letter is more in line with the way

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

2015-06-02 Thread Junio C Hamano
Gondek, Andreas andreas.gon...@dwpbank.de writes: thank you for responding this fast. I would suggest providing this information as an additional parameter (like %A %O %B and %L) maybe %P. Yes, per-cent plus a letter is more in line with the way information is passed to the scripts already.