From: David Kastrup <dak@gnu.org>
Date: Thu, 06 Feb 2014 16:10:04 GMT
Subject: Re: Confusing git log --- First time bug submission please advise on best practices
Message-ID: <874n4cjk83.fsf@fencepost.gnu.org>
In-Reply-To: <CAAH6HY8unuytrKpEA-eisojUkG=X4D+o+vQDO5bC5YCSmusoHw@mail.gmail.com>

Vincent van Ravesteijn <vfr@lyx.org> writes:

> The commits that are in the log for master and which are not in the
> log for originssh/master are merged in at "6833fd4 (HEAD, master);
> Completed merge".
>
> As "git log" can only present the commits in a linear way, it shows
> the commits from the ancentry of both parents of HEAD in a reverse
> chronological order. This means that the commits from the two
> ancestries are mixed and commits that are shown after each other don't
> have to be parent and child. See the documentation of "git log" and
> the section "Commit Ordering": "By default, the commits are shown in
> reverse chronological order."

git log --graph can help with getting a better picture.

-- 
David Kastrup