fixed sub-slides for git.ipynb

git.ipynb

@@ -516,7 +516,7 @@
      "language": "python",
      "metadata": {
       "slideshow": {
-       "slide_type": "fragment"
+       "slide_type": "-"
       }
      },
      "outputs": [
@@ -850,10 +850,13 @@
      "cell_type": "markdown",
      "metadata": {
       "slideshow": {
-       "slide_type": "fragment"
+       "slide_type": "subslide"
       }
      },
      "source": [
+      "Git - basics\n",
+      "===\n",
+      "\n",
       "Rmoving files\n",
       "---"
      ]
@@ -902,7 +905,7 @@
      "language": "python",
      "metadata": {
       "slideshow": {
-       "slide_type": "fragment"
+       "slide_type": "-"
       }
      },
      "outputs": [
@@ -987,7 +990,11 @@
       "git status"
      ],
      "language": "python",
-     "metadata": {},
+     "metadata": {
+      "slideshow": {
+       "slide_type": "fragment"
+      }
+     },
      "outputs": [
       {
        "output_type": "stream",
@@ -1105,7 +1112,7 @@
      "cell_type": "markdown",
      "metadata": {
       "slideshow": {
-       "slide_type": "subslide"
+       "slide_type": "slide"
       }
      },
      "source": [
@@ -1117,7 +1124,11 @@
     },
     {
      "cell_type": "markdown",
-     "metadata": {},
+     "metadata": {
+      "slideshow": {
+       "slide_type": "slide"
+      }
+     },
      "source": [
       "Git - Remote workflow\n",
       "===\n",
@@ -1297,7 +1308,11 @@
     },
     {
      "cell_type": "markdown",
-     "metadata": {},
+     "metadata": {
+      "slideshow": {
+       "slide_type": "subslide"
+      }
+     },
      "source": [
       "Git - remote repository\n",
       "===\n",
@@ -1390,6 +1405,44 @@
       "* unconventional usages (documenation, git-annex, etc.)"
      ]
     },
+    {
+     "cell_type": "markdown",
+     "metadata": {
+      "slideshow": {
+       "slide_type": "subslide"
+      }
+     },
+     "source": [
+      "Git - branching\n",
+      "===\n",
+      "\n",
+      "Master branch\n",
+      "---\n",
+      "\n",
+      "We are already working in a branch called **master**."
+     ]
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "%%sh\n",
+      "\n",
+      "git branch -v"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "* master 56fe8bf add more files to repo\n"
+       ]
+      }
+     ],
+     "prompt_number": 25
+    },
     {
      "cell_type": "markdown",
      "metadata": {
@@ -1426,7 +1479,11 @@
       "git checkout new_experiment"
      ],
      "language": "python",
-     "metadata": {},
+     "metadata": {
+      "slideshow": {
+       "slide_type": "fragment"
+      }
+     },
      "outputs": []
     },
     {
@@ -1450,7 +1507,11 @@
       "git merge new_experiment"
      ],
      "language": "python",
-     "metadata": {},
+     "metadata": {
+      "slideshow": {
+       "slide_type": "fragment"
+      }
+     },
      "outputs": []
     },
     {