Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Minor tweaks to the Remotes section

  • Loading branch information...
commit c04864a7490b533578f49adbfd49bea11a3c5c1e 1 parent 9a0a0b8
@whiteinge authored
Showing with 2 additions and 4 deletions.
  1. +2 −4 cars_2012-04-27_git/presentation.rst
View
6 cars_2012-04-27_git/presentation.rst
@@ -170,7 +170,7 @@ Directed acyclic graph (DAG)
Your repository::
% for commit in A B C D
- for> touch $commit && git add $commit && git commit -m "Added $commit"
+ for> touch $commit && git add $commit && git commit -m "Added $commit" && git tag $commit
.. figure:: img/branchone.pdf
@@ -182,7 +182,7 @@ Directed acyclic graph (DAG)
Their repository::
% for commit in E F G H I
- for> touch $commit && git add $commit && git commit -m "Added $commit"
+ for> touch $commit && git add $commit && git commit -m "Added $commit" && git tag $commit
.. figure:: img/branchtwo.pdf
@@ -416,8 +416,6 @@ Demonstration
CONFLICT (content): Merge conflict in A
Automatic merge failed; fix conflicts and then commit the result.
- % git mergetool
-
* Fetch a remote branch
* Compare commits
* Compare changes
Please sign in to comment.
Something went wrong with that request. Please try again.