Thanks for your clear response. I can see where I went wrong now.
On Thu, Feb 6, 2014 at 4:10 PM, David Kastrup <d...@gnu.org> wrote: > Vincent van Ravesteijn <v...@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 -- 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
