Re: [PATCH 1/2] merge: setup `opts` later in `checkout_fast_forward()`
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Apr 24, 2018, 11:30 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1804241329310.64@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
- In-Reply-To
- <CAN0heSqo43YkHa-1e7jaZqxktenonj3HZFrF=AKYR4+3ciZ2Sg@mail.gmail.com>
Hi Martin,
On Tue, 24 Apr 2018, Martin Ågren wrote:
Show 9 quoted lines
> On 24 April 2018 at 08:20, Jacob Keller <jacob.keller@gmail.com> wrote: > > I'm guessing the diff algorithm simply found that this was a more > > compact representation of the change? It's a bit confusing when your > > description indicates you "moved" some code down, but it looks like > > you moved code up. > > Agreed. I'll play with --anchored and other magic stuff to see if I can > improve this. Or I could instead try to sell this patch as "move some > other stuff out of the way" ;-) That seems a bit less direct though.
Or you could add a remark to the commit message along the lines "best viewed with `--anchored=...`". This is what I would do ;-)
Ciao, Dscho