On Fri, May 29, 2009 at 10:55 PM, Matt Haggard <[email protected]> wrote: > > Is there a way to preview exactly what a git merge will do? > > git diff shows me the difference between two commits, but I don't know > every time which difference will win. > > Anyone else experience this? I'll look for a concrete example if > you'd like.
Perhaps : git merge --no-commit --no-ff will help.. regards, aneesh --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/git-users?hl=en -~----------~----~----~----~------~----~------~--~---
