diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-09-20 15:55:22 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-20 15:55:22 -0700 |
commit | 467ad254717a52c657394ce6c662cb78a2bd7c16 (patch) | |
tree | bbd5b7448d1028a0039a707447a20e0fa9b0d815 /Documentation/gitcore-tutorial.txt | |
parent | Merge branch 'dg/run-command-child-cleanup' into maint (diff) | |
parent | Documentation: describe subject more precisely (diff) | |
download | tgif-467ad254717a52c657394ce6c662cb78a2bd7c16.tar.xz |
Merge branch 'jw/doc-commit-title' into maint
* jw/doc-commit-title:
Documentation: describe subject more precisely
Diffstat (limited to 'Documentation/gitcore-tutorial.txt')
-rw-r--r-- | Documentation/gitcore-tutorial.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt index 9d893369a0..5325c5a7d5 100644 --- a/Documentation/gitcore-tutorial.txt +++ b/Documentation/gitcore-tutorial.txt @@ -956,12 +956,11 @@ $ git show-branch --topo-order --more=1 master mybranch ------------------------------------------------ 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 +with the titles of 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. +branch. Three commits are shown along with their titles. 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 |