diff options
Diffstat (limited to 'Documentation/gitcore-tutorial.txt')
| -rw-r--r-- | Documentation/gitcore-tutorial.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt index b7380b069a..e237394397 100644 --- a/Documentation/gitcore-tutorial.txt +++ b/Documentation/gitcore-tutorial.txt @@ -1186,9 +1186,9 @@ $ git show-branch * [master] Some fun. ! [mybranch] Some work. -- - + [mybranch] Some work. * [master] Some fun. -*+ [mybranch^] Initial commit + + [mybranch] Some work. +*+ [master^] Initial commit ------------ Now we are ready to experiment with the merge by hand. |