Re: What's cooking in git.git (Jun 2016, #05; Thu, 16)
- From
Torsten Bögershausen <tboegi@web.de>
- Date
- Jun 20, 2016, 06:06 UTC
- Message-ID
- <18617acb-bcdb-607d-007e-552dabd352cb@web.de>
- In-Reply-To
- <xmqqk2ho33ig.fsf@gitster.mtv.corp.google.com>
There is a conflict in pu: "jh/clean-smudge-annex" does not work together with "tb/convert-peek-in-index"
(And currently pu didn't compile)
(I will hopefully be able to do a separate review of the smudge/clean patch)
(And joeyh@joeyh.name is not reachable from web.de)