Re: Seeing git history of file including merge changes

2015-09-09 Thread Jeff King
On Wed, Sep 09, 2015 at 11:26:47AM +0300, Dov Grobgeld wrote: > The file was changed in commit B and the changes were undone in commit M. > > My problem is how to view the changes to the file between a specific > commit, e.g. B and another commit in its "downstream", e.g. H. > > If you do > >

Re: Seeing git history of file including merge changes

2015-09-09 Thread Dov Grobgeld
I asked the following question on StackOverflow a while ago, but did not receive any answers so I'll try here. We have git repository where a file was changed on a topic branch and this branch was then merged back into the main branch. Due to various reasons the merge was made wrongly and as a res