remove --amend for now

advanced/advanced.md

@@ -0,0 +1,20 @@
+!SLIDE
+
+# Fixing mistakes
+
+
+
+!SLIDE gitcmd
+
+# git commit --amend
+
+## Modify the content of the **last commit**
+
+<pre>
+           $ vim README
+           $ git add -p
+           $ git commit --amend
+</pre>
+
+
+

branch/branch.md

@@ -301,26 +301,6 @@ $ cat hello.sh        <span class="comment"># master version</span>
 
 
 
-!SLIDE
-
-# Fixing mistakes
-
-
-
-!SLIDE gitcmd
-
-# git commit --amend
-
-## Modify the content of the **last commit**
-
-<pre>
-           $ vim README
-           $ git add -p
-           $ git commit --amend
-</pre>
-
-
-
 !SLIDE center
 
 ## Recap of forked lineage
@@ -466,7 +446,7 @@ $ cat hello.sh        <span class="comment"># master version</span>
 
 !SLIDE
 
-# Let's induce a merge conflict
+# What about merge conflicts?
 
 
 
@@ -492,7 +472,7 @@ $ cat hello.sh        <span class="comment"># master version</span>
 !SLIDE
 
 ## Cleanly merged files are staged.
-## Conflicts are left in workind dir.
+## Conflicts are left in working dir.
 
 <pre>
        $ git diff --staged  <span class="comment"># clean</span>

collab/collab.md

@@ -0,0 +1,40 @@
+!SLIDE reverse
+
+# Collaboration
+
+
+
+!SLIDE
+
+## Back to your repos directory
+
+                     $ cd ..
+
+
+
+!SLIDE gitcmd
+
+# git clone
+
+## Clone a local repository
+
+           $ git clone hello helloclone
+           $ cd helloclone
+
+
+
+!SLIDE center
+
+## You can also clone from remote repositories
+
+![github-repo](github-repo.png)
+
+
+
+!SLIDE gitcmd
+
+# git branch -a
+
+## Show all branches (local and remote)
+
+                  $ git branch -a

showoff.json

@@ -2,5 +2,6 @@
   {"section":"title"},
   {"section":"install"},
   {"section":"create"},
-  {"section":"branch"}
+  {"section":"branch"},
+  {"section":"collab"}
 ]