Re: Locating merge that dropped a change

2013-04-11 Thread Junio C Hamano
Kevin Bracey writes: > I think I've found the problem. It only doesn't work _if you specify > the file_. > > Specifically, if I was missing an addition, my first attempt to find > it would be > > git log -p -m -S > > If the addition was lost in a merge, that doesn't even show the > addition, w

Re: Locating merge that dropped a change

2013-04-11 Thread Kevin Bracey
On 09/04/2013 21:00, Kevin Bracey wrote: So, how to automatically find a merge that ignored a known change? I think I've found the problem. It only doesn't work _if you specify the file_. Specifically, if I was missing an addition, my first attempt to find it would be git log -p -m -S

Locating merge that dropped a change

2013-04-09 Thread Kevin Bracey
This morning, I was struggling (not for the first time) to produce a Git command that would identify a merge commit that dropped a change. I could see where it was added, but couldn't automate finding out why it wasn't any longer in HEAD. All the permutations of "--full-history", "-m", "-S", "