diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-07 16:06:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-07 16:06:45 -0700 |
| commit | 7f498065e9bf85f6f3e954ec57dedf56fec29e01 (patch) | |
| tree | d5bd668d03aaa23fcfc280c861a77b29a598d758 /Documentation/core-tutorial.txt | |
| parent | 2c4c17fbb9c26cdc411126a2c5365e3fc3a0242a (diff) | |
| parent | 0438402271cccc1711c603b0a7ba3134f1ce30f1 (diff) | |
| download | git-7f498065e9bf85f6f3e954ec57dedf56fec29e01.tar.xz | |
Merge branch 'mw/alternates' into next
* mw/alternates:
clone: don't clone the info/alternates file
test case for transitive info/alternates
Transitively read alternatives
repack: honor -d even when no new pack was created
clone: keep --reference even with -l -s
repo-config: document what value_regexp does a bit more clearly.
Release config lock if the regex is invalid
core-tutorial.txt: escape asterisk
Sparse fix for builtin-diff
Fix users of prefix_path() to free() only when necessary
Diffstat (limited to 'Documentation/core-tutorial.txt')
| -rw-r--r-- | Documentation/core-tutorial.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt index 4211c81972..d1360ecde2 100644 --- a/Documentation/core-tutorial.txt +++ b/Documentation/core-tutorial.txt @@ -971,7 +971,7 @@ $ git show-branch --topo-order 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 +(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. |