On Jun 7, 12:04 pm, matseitz_cisco <matse...@cisco.com> wrote:
> On Jun 7, 6:32 am, Dieter Van de Walle <dieter...@gmail.com> wrote:
> > This is what happened:
> > - Remote branch has commits A B C D E F
> > - User has commits A B C X Y Z
> > User does a pull and is presented with some merge conflicts.
> > Novice user does not know how to handle this, and brings his working
> > tree back to the state he wants, and in the process annihilates all
> > changes of commits D E and F .
> > This causes the following graph:
> > - Remote: A-B-C-D-E-F--------M--
> > - User: A-B-C-------X-Y-Z-/
> Since this is a pull, not a push, shoult the chart look like this?
> - Remote: A-B-C-D-E-F-------+--
> - User: A-B-C-------X-Y-Z-M
> > However, in commit M (the merge) all changes of commits D E and F have
> > been reverted.
> > If however you issue a 'git log' command, this is not visible.
> > When looking at the log a file that was changed in commit F, no change
> > is listed in commit M.
> > => Changes done in a merge commit are not visible!
A colleague just suggested "git log -m"
This flag makes the merge commits show the full diff like regular
commits; for each merge parent, a separate log entry and diff is
generated. An exception is that only diff against the first parent is
shown when --first-parent option is given; in that case, the output
represents the changes the merge brought into the then-current branch.
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@example.com.
To unsubscribe from this group, send email to
For more options, visit this group at