diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-11-25 10:58:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-11-25 10:58:17 +0000 |
| commit | 3eacf1092cf41aabd5b4ccb418b62de682b2e715 (patch) | |
| tree | 80d453957c7ba91fe2eec68a3f5d6bfd3dba51ce /gitcore-tutorial.txt | |
| parent | 5706e0b5cf3d63b8c655239151d8e2ab308ffa4a (diff) | |
| download | git-htmldocs-3eacf1092cf41aabd5b4ccb418b62de682b2e715.tar.gz | |
Autogenerated HTML docs for v1.6.6-rc0-54-gb073b
Diffstat (limited to 'gitcore-tutorial.txt')
| -rw-r--r-- | gitcore-tutorial.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gitcore-tutorial.txt b/gitcore-tutorial.txt index b7380b069..e23739439 100644 --- a/gitcore-tutorial.txt +++ b/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. |