Or is it me who needs a fix? [Sorry, this is roughly a repeat of my earlier post <http://permalink.gmane.org/gmane.comp.version-control.git/62493> I didn't get any answer to, and I'm trying once more to attract your attention to the issue.] Please consider the following quote starting at core-tutorial.txt:933 (emphasis is mine): <quote> ------------------------------------------------ $ git show-branch --topo-order master mybranch * [master] Merge work in mybranch ! [mybranch] Some work. -- - [master] Merge work in mybranch *+ [mybranch] Some work. ------------------------------------------------ The first two lines indicate that it is showing the two branches and the first line of the commit log message from their top-of-the-tree commits, you are currently on `master` branch (notice the asterisk `\*` character), and the first column for the later output lines is used to show commits contained in the `master` branch, and the second column for the `mybranch` branch. *Three* commits are shown along with their log messages. All of them have non blank characters in the first column (`*` shows an ordinary commit on the current branch, `-` is a merge commit), which means they are now part of the `master` branch. Only the "Some work" commit has the plus `+` character in the second column, because `mybranch` has not been merged to incorporate these commits from the master branch. The string inside brackets before the commit log message is a short name you can use to name the commit. In the above example, 'master' and 'mybranch' are branch heads. '*master~1*' is the first parent of 'master' branch head. </quote> You see, there are only *two* commits shown by git-show-branch while description mentions *three* of them, and there is no 'master~1' commit in the git-show-branch output while description does mention it. I've replayed all the tutorial up to this point, and the git-show-branch output matches those in the tutorial exactly, but then the explanation text makes little sense? On the other hand, the state of the repo suggests that there should be 'master~1' commit in the git-show-branch output in accordance with the explanation, so it's git-show-branch that is buggy? I'm totally confused :( Please, help! -- Sergei. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
