On Mon, Nov 26, 2012 at 2:38 PM, Matthieu Moy <matthieu....@grenoble-inp.fr> wrote: > Igor Lautar <igor.lau...@gmail.com> writes: >> Somewhat, but it does not explain why the file no longer has that >> change. > > It still has, but it's not shown by "git log <file>", probably because > one of the parent of the merge commit introduces no change for this > file, so one side of the merge is not needed to explain you how you went > from the origin of time to the last commit.
No, the change is not there. See below. > Try this: > > commit=<sha1 of your merge commit> > # Show diff with first parent: > git diff "$commit" "$commit"^1 > # Show diff with second parent: > git diff "$commit" "$commit"^2 Yes, change is shown in commit^2, but actual file after merge does not have it. I've double and triple checked, it is just not there. In the end, I've cherry-picked the same commit after the merge and change is applied. If change would be there after the merge, cherry-pick would not have anything to do (whole commit is a one line change in single file). So its not that the history is hidden, the change *is* missing after the merge. Is there anything else I can try to figure out why its missing (other than actually debugging git code/scripts)? Like debug output for each change being considered/merged in? Regards, Igor -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
