From 2812f3c0209d97db2f1ae967f0cea3a23edd6390 Mon Sep 17 00:00:00 2001
From: "Z. Tatum" <z.tatum@lumc.nl>
Date: Fri, 2 Aug 2013 18:35:43 +0200
Subject: [PATCH] update Outs for git notebook
---
git.ipynb | 116 +++++++++++++++++++++++++++---------------------------
1 file changed, 59 insertions(+), 57 deletions(-)
diff --git a/git.ipynb b/git.ipynb
index 6296e73..2951dba 100644
--- a/git.ipynb
+++ b/git.ipynb
@@ -263,7 +263,7 @@
"language": "python",
"metadata": {},
"outputs": [],
- "prompt_number": 5
+ "prompt_number": 1
},
{
"cell_type": "markdown",
@@ -297,7 +297,7 @@
]
}
],
- "prompt_number": 1
+ "prompt_number": 2
},
{
"cell_type": "code",
@@ -318,7 +318,7 @@
]
}
],
- "prompt_number": 4
+ "prompt_number": 3
},
{
"cell_type": "code",
@@ -336,13 +336,13 @@
"stream": "stdout",
"text": [
"total 20\n",
- "drwxr-xr-x 3 ztatum ztatum 4096 Aug 2 14:29 .\n",
- "drwxrwxrwt 13 root root 12288 Aug 2 14:29 ..\n",
- "drwxr-xr-x 7 ztatum ztatum 4096 Aug 2 14:29 .git\n"
+ "drwxr-xr-x 3 ztatum ztatum 4096 Aug 2 18:27 .\n",
+ "drwxrwxrwt 13 root root 12288 Aug 2 18:26 ..\n",
+ "drwxr-xr-x 7 ztatum ztatum 4096 Aug 2 18:27 .git\n"
]
}
],
- "prompt_number": 2
+ "prompt_number": 4
},
{
"cell_type": "markdown",
@@ -410,7 +410,7 @@
"language": "python",
"metadata": {},
"outputs": [],
- "prompt_number": 12
+ "prompt_number": 6
},
{
"cell_type": "code",
@@ -428,17 +428,18 @@
"stream": "stdout",
"text": [
"# On branch master\n",
- "# Changes not staged for commit:\n",
- "# (use \"git add <file>...\" to update what will be committed)\n",
- "# (use \"git checkout -- <file>...\" to discard changes in working directory)\n",
"#\n",
- "#\tmodified: README\n",
+ "# Initial commit\n",
"#\n",
- "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+ "# Untracked files:\n",
+ "# (use \"git add <file>...\" to include in what will be committed)\n",
+ "#\n",
+ "#\tREADME\n",
+ "nothing added to commit but untracked files present (use \"git add\" to track)\n"
]
}
],
- "prompt_number": 13
+ "prompt_number": 7
},
{
"cell_type": "markdown",
@@ -487,7 +488,7 @@
]
}
],
- "prompt_number": 4
+ "prompt_number": 8
},
{
"cell_type": "markdown",
@@ -523,13 +524,13 @@
"output_type": "stream",
"stream": "stdout",
"text": [
- "[master (root-commit) 021a07d] add README to repository\n",
- " 0 files changed\n",
+ "[master (root-commit) bd4898f] add README to repository\n",
+ " 1 file changed, 1 insertion(+)\n",
" create mode 100644 README\n"
]
}
],
- "prompt_number": 6
+ "prompt_number": 9
},
{
"cell_type": "markdown",
@@ -606,7 +607,7 @@
]
}
],
- "prompt_number": 7
+ "prompt_number": 10
},
{
"cell_type": "code",
@@ -627,14 +628,14 @@
"output_type": "stream",
"stream": "stdout",
"text": [
- "[master b662f1a] add more files to repo\n",
+ "[master 5c68824] add more files to repo\n",
" 0 files changed\n",
" create mode 100644 file1.txt\n",
" create mode 100644 file2.txt\n"
]
}
],
- "prompt_number": 8
+ "prompt_number": 11
},
{
"cell_type": "markdown",
@@ -666,12 +667,12 @@
"output_type": "stream",
"stream": "stdout",
"text": [
- "\u001b[33mb662f1a\u001b[m -\u001b[31m (HEAD, master)\u001b[m add more files to repo \u001b[32m(3 seconds ago) \u001b[1;34m<Z. Tatum>\u001b[m\n",
- "\u001b[33m021a07d\u001b[m -\u001b[31m\u001b[m add README to repository \u001b[32m(34 seconds ago) \u001b[1;34m<Z. Tatum>\u001b[m"
+ "\u001b[33m5c68824\u001b[m -\u001b[31m (HEAD, master)\u001b[m add more files to repo \u001b[32m(4 seconds ago) \u001b[1;34m<Z. Tatum>\u001b[m\n",
+ "\u001b[33mbd4898f\u001b[m -\u001b[31m\u001b[m add README to repository \u001b[32m(12 seconds ago) \u001b[1;34m<Z. Tatum>\u001b[m"
]
}
],
- "prompt_number": 9
+ "prompt_number": 12
},
{
"cell_type": "code",
@@ -692,18 +693,16 @@
"output_type": "stream",
"stream": "stdout",
"text": [
- "\u001b[33mb73d401\u001b[m -\u001b[31m (HEAD, master)\u001b[m Update README with interesting stuff. \u001b[32m(39 seconds ago) \u001b[1;34m<Z. Tatum>\u001b[m\n",
- "\n",
- "\u001b[33mb662f1a\u001b[m -\u001b[31m\u001b[m add more files to repo \u001b[32m(59 minutes ago) \u001b[1;34m<Z. Tatum>\u001b[m\n",
+ "\u001b[33m5c68824\u001b[m -\u001b[31m (HEAD, master)\u001b[m add more files to repo \u001b[32m(6 seconds ago) \u001b[1;34m<Z. Tatum>\u001b[m\n",
" create mode 100644 file1.txt\n",
" create mode 100644 file2.txt\n",
"\n",
- "\u001b[33m021a07d\u001b[m -\u001b[31m\u001b[m add README to repository \u001b[32m(60 minutes ago) \u001b[1;34m<Z. Tatum>\u001b[m\n",
+ "\u001b[33mbd4898f\u001b[m -\u001b[31m\u001b[m add README to repository \u001b[32m(14 seconds ago) \u001b[1;34m<Z. Tatum>\u001b[m\n",
" create mode 100644 README\n"
]
}
],
- "prompt_number": 20
+ "prompt_number": 13
},
{
"cell_type": "markdown",
@@ -731,7 +730,7 @@
"language": "python",
"metadata": {},
"outputs": [],
- "prompt_number": 17
+ "prompt_number": 14
},
{
"cell_type": "markdown",
@@ -756,17 +755,16 @@
"stream": "stdout",
"text": [
"diff --git a/README b/README\n",
- "index e69de29..6a08c61 100644\n",
+ "index 323f517..bf576e7 100644\n",
"--- a/README\n",
"+++ b/README\n",
- "@@ -0,0 +1,3 @@\n",
- "+This is a simple test repository\n",
- "+This repo is getting interesting\n",
+ "@@ -1 +1,2 @@\n",
+ " This is a simple test repository\n",
"+This repo is getting interesting\n"
]
}
],
- "prompt_number": 18
+ "prompt_number": 15
},
{
"cell_type": "markdown",
@@ -799,12 +797,12 @@
"output_type": "stream",
"stream": "stdout",
"text": [
- "[master b73d401] Update README with interesting stuff.\n",
- " 1 file changed, 3 insertions(+)\n"
+ "[master 33a1231] Update README with interesting stuff.\n",
+ " 1 file changed, 1 insertion(+)\n"
]
}
],
- "prompt_number": 19
+ "prompt_number": 16
},
{
"cell_type": "markdown",
@@ -842,15 +840,11 @@
"# (use \"git reset HEAD <file>...\" to unstage)\n",
"#\n",
"#\trenamed: file1.txt -> file_boring.txt\n",
- "#\n",
- "# Untracked files:\n",
- "# (use \"git add <file>...\" to include in what will be committed)\n",
- "#\n",
- "#\tfile.txt\n"
+ "#\n"
]
}
],
- "prompt_number": 21
+ "prompt_number": 17
},
{
"cell_type": "markdown",
@@ -891,15 +885,11 @@
"#\n",
"#\tdeleted: file2.txt\n",
"#\trenamed: file1.txt -> file_boring.txt\n",
- "#\n",
- "# Untracked files:\n",
- "# (use \"git add <file>...\" to include in what will be committed)\n",
- "#\n",
- "#\tfile.txt\n"
+ "#\n"
]
}
],
- "prompt_number": 22
+ "prompt_number": 18
},
{
"cell_type": "code",
@@ -920,14 +910,14 @@
"output_type": "stream",
"stream": "stdout",
"text": [
- "[master 8521731] renaming and removing files\n",
+ "[master 1cf2126] renaming and removing files\n",
" 1 file changed, 0 insertions(+), 0 deletions(-)\n",
" delete mode 100644 file2.txt\n",
" rename file1.txt => file_boring.txt (100%)\n"
]
}
],
- "prompt_number": 23
+ "prompt_number": 19
},
{
"cell_type": "markdown",
@@ -1049,8 +1039,7 @@
"input": [
"%%sh\n",
"\n",
- "git remote add origin https://git.lumc.nl/z.tatum/myproject\n",
- "git push -u origin master"
+ "git remote add origin git@git.lumc.nl:z.tatum/myproject.git"
],
"language": "python",
"metadata": {
@@ -1058,6 +1047,19 @@
"slide_type": "-"
}
},
+ "outputs": [],
+ "prompt_number": 26
+ },
+ {
+ "cell_type": "code",
+ "collapsed": false,
+ "input": [
+ "%%sh \n",
+ "\n",
+ "git push -u origin master"
+ ],
+ "language": "python",
+ "metadata": {},
"outputs": [
{
"output_type": "stream",
@@ -1070,12 +1072,12 @@
"output_type": "stream",
"stream": "stderr",
"text": [
- "fatal: remote origin already exists.\n",
- "Everything up-to-date\n"
+ "To git@git.lumc.nl:z.tatum/myproject.git\n",
+ " * [new branch] master -> master\n"
]
}
],
- "prompt_number": 24
+ "prompt_number": 27
},
{
"cell_type": "markdown",
--
GitLab