Updated Git presentation for skdy

kiloforce · Feb 3, 2012 · 74ce800 · 74ce800
1 parent 1ee67f0
commit 74ce800
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/soc_2011-07-22_git/graph-dag.sh → skdy_2012-02-03_git/graph-dag.sh b/soc_2011-07-22_git/graph-dag.sh → skdy_2012-02-03_git/graph-dag.sh
diff --git a/soc_2011-07-22_git/img/dag.pdf → skdy_2012-02-03_git/img/dag.pdf b/soc_2011-07-22_git/img/dag.pdf → skdy_2012-02-03_git/img/dag.pdf
diff --git a/soc_2011-07-22_git/img/ex-amend1.pdf → skdy_2012-02-03_git/img/ex-amend1.pdf b/soc_2011-07-22_git/img/ex-amend1.pdf → skdy_2012-02-03_git/img/ex-amend1.pdf
diff --git a/soc_2011-07-22_git/img/ex-amend2.pdf → skdy_2012-02-03_git/img/ex-amend2.pdf b/soc_2011-07-22_git/img/ex-amend2.pdf → skdy_2012-02-03_git/img/ex-amend2.pdf
diff --git a/skdy_2012-02-03_git/presentation.pdf b/skdy_2012-02-03_git/presentation.pdf
diff --git a/soc_2011-07-22_git/presentation.rst → skdy_2012-02-03_git/presentation.rst b/soc_2011-07-22_git/presentation.rst → skdy_2012-02-03_git/presentation.rst
@@ -2,9 +2,9 @@
 Git: Remotes, Branching, and Rebasing
 =====================================
 
-:Organization: SendOutCards
+:Organization: Skullcandy
 :Author: Seth House <seth@eseth.com>
-:Date: 2011-07-22
+:Date: 2012-02-03
 
 .. raw:: latex
 
@@ -45,6 +45,13 @@ Mirroring a repo
 
     git push --mirror myremote
 
+or:
+
+.. code-block:: bash
+
+    git push myremote \
+        refs/remotes/myremote/*:refs/heads/*
+
 Remote branches
 ---------------
 
@@ -145,13 +152,6 @@ Or:
     git fetch
     git rebase @{u}
 
-Or:
-
-.. code-block:: bash
-
-    git fetch
-    git reset --hard @{u}
-
 Branching
 =========
 

diff --git a/soc_2011-07-22_git/presentation.pdf b/soc_2011-07-22_git/presentation.pdf