Skip to content

Commit

Permalink
Final changes during lecture
Browse files Browse the repository at this point in the history
  • Loading branch information
@fperez
fperez committed Jun 19, 2019
1 parent 8286d86 commit 0b06229
Show file tree
Hide file tree
Showing 3 changed files with 157 additions and 97 deletions.
40 changes: 40 additions & 0 deletions 01-Intro Jupyter Notebook.ipynb
View file

Large diffs are not rendered by default.

156 changes: 88 additions & 68 deletions 03-Git-Tutorial.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,26 @@
"### `git init`: create an empty repository"
]
},
{
"cell_type": "code",
"execution_count": 3,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"'/Users/fperez/teach/icesat2/intro-jupyter-git'"
]
},
"execution_count": 3,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"%pwd"
]
},
{
"cell_type": "code",
"execution_count": 4,
Expand Down Expand Up @@ -439,9 +459,9 @@
"output_type": "stream",
"text": [
"total 0\n",
"drwxr-xr-x 3 fperez staff 96 Jun 17 02:09 .\n",
"drwxr-xr-x 27 fperez staff 864 Jun 17 02:09 ..\n",
"drwxr-xr-x 9 fperez staff 288 Jun 17 02:09 .git\n"
"drwxr-xr-x 3 fperez staff 96 Jun 19 08:52 .\n",
"drwxr-xr-x 31 fperez staff 992 Jun 19 08:52 ..\n",
"drwxr-xr-x 9 fperez staff 288 Jun 19 08:52 .git\n"
]
}
],
Expand All @@ -464,13 +484,13 @@
"output_type": "stream",
"text": [
"total 24\n",
"-rw-r--r-- 1 fperez staff 23 Jun 17 02:09 HEAD\n",
"-rw-r--r-- 1 fperez staff 137 Jun 17 02:09 config\n",
"-rw-r--r-- 1 fperez staff 73 Jun 17 02:09 description\n",
"drwxr-xr-x 13 fperez staff 416 Jun 17 02:09 hooks\n",
"drwxr-xr-x 3 fperez staff 96 Jun 17 02:09 info\n",
"drwxr-xr-x 4 fperez staff 128 Jun 17 02:09 objects\n",
"drwxr-xr-x 4 fperez staff 128 Jun 17 02:09 refs\n"
"-rw-r--r-- 1 fperez staff 23 Jun 19 08:52 HEAD\n",
"-rw-r--r-- 1 fperez staff 137 Jun 19 08:52 config\n",
"-rw-r--r-- 1 fperez staff 73 Jun 19 08:52 description\n",
"drwxr-xr-x 13 fperez staff 416 Jun 19 08:52 hooks\n",
"drwxr-xr-x 3 fperez staff 96 Jun 19 08:52 info\n",
"drwxr-xr-x 4 fperez staff 128 Jun 19 08:52 objects\n",
"drwxr-xr-x 4 fperez staff 128 Jun 19 08:52 refs\n"
]
}
],
Expand Down Expand Up @@ -578,14 +598,14 @@
},
{
"cell_type": "code",
"execution_count": 16,
"execution_count": 11,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"[master (root-commit) 8ce7775] This is our first commit\n",
"[master (root-commit) f850212] This is our first commit\n",
" 1 file changed, 1 insertion(+)\n",
" create mode 100644 file1.txt\n"
]
Expand Down Expand Up @@ -618,16 +638,16 @@
},
{
"cell_type": "code",
"execution_count": 17,
"execution_count": 12,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"commit 8ce7775da6ee3d042f78924aa1904154fd4c92f8\n",
"commit f850212ca594f6e4c4ba246f1567f1d21e8869a8\n",
"Author: Fernando Perez <Fernando.Perez@berkeley.edu>\n",
"Date: Wed Sep 6 23:24:25 2017 -0700\n",
"Date: Wed Jun 19 08:52:41 2019 -0700\n",
"\n",
" This is our first commit\n"
]
Expand Down Expand Up @@ -656,7 +676,7 @@
},
{
"cell_type": "code",
"execution_count": 18,
"execution_count": 13,
"metadata": {
"collapsed": true,
"jupyter": {
Expand All @@ -680,7 +700,7 @@
},
{
"cell_type": "code",
"execution_count": 19,
"execution_count": 14,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -752,14 +772,14 @@
},
{
"cell_type": "code",
"execution_count": 20,
"execution_count": 15,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"[master f0163df] I have made great progress on this critical matter.\n",
"[master 943ee30] I have made great progress on this critical matter.\n",
" 1 file changed, 1 insertion(+)\n"
]
}
Expand Down Expand Up @@ -787,22 +807,22 @@
},
{
"cell_type": "code",
"execution_count": 21,
"execution_count": 16,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"commit f0163df7db81ece0345dccc6d975dec9d4d7529f\n",
"commit 943ee30cdfc3a32f4b6f8f8c6b1ef4f6ca505624\n",
"Author: Fernando Perez <Fernando.Perez@berkeley.edu>\n",
"Date: Wed Sep 6 23:24:34 2017 -0700\n",
"Date: Wed Jun 19 08:52:56 2019 -0700\n",
"\n",
" I have made great progress on this critical matter.\n",
"\n",
"commit 8ce7775da6ee3d042f78924aa1904154fd4c92f8\n",
"commit f850212ca594f6e4c4ba246f1567f1d21e8869a8\n",
"Author: Fernando Perez <Fernando.Perez@berkeley.edu>\n",
"Date: Wed Sep 6 23:24:25 2017 -0700\n",
"Date: Wed Jun 19 08:52:41 2019 -0700\n",
"\n",
" This is our first commit\n"
]
Expand All @@ -824,15 +844,15 @@
},
{
"cell_type": "code",
"execution_count": 22,
"execution_count": 17,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"* f0163df I have made great progress on this critical matter.\n",
"* 8ce7775 This is our first commit\n"
"* 943ee30 I have made great progress on this critical matter.\n",
"* f850212 This is our first commit\n"
]
}
],
Expand All @@ -852,15 +872,15 @@
},
{
"cell_type": "code",
"execution_count": 23,
"execution_count": 18,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"* f0163df I have made great progress on this critical matter.\n",
"* 8ce7775 This is our first commit\n"
"* 943ee30 I have made great progress on this critical matter.\n",
"* f850212 This is our first commit\n"
]
}
],
Expand Down Expand Up @@ -891,7 +911,7 @@
},
{
"cell_type": "code",
"execution_count": 24,
"execution_count": 19,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -924,20 +944,20 @@
},
{
"cell_type": "code",
"execution_count": 25,
"execution_count": 20,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"[master 258b69f] I like this new name better\n",
"[master db7b10a] I like this new name better\n",
" 1 file changed, 0 insertions(+), 0 deletions(-)\n",
" rename file1.txt => file-newname.txt (100%)\n",
"Let's look at the log again:\n",
"* 258b69f I like this new name better\n",
"* f0163df I have made great progress on this critical matter.\n",
"* 8ce7775 This is our first commit\n"
"* db7b10a I like this new name better\n",
"* 943ee30 I have made great progress on this critical matter.\n",
"* f850212 This is our first commit\n"
]
}
],
Expand Down Expand Up @@ -1044,7 +1064,7 @@
},
{
"cell_type": "code",
"execution_count": 26,
"execution_count": 21,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -1074,7 +1094,7 @@
},
{
"cell_type": "code",
"execution_count": 27,
"execution_count": 22,
"metadata": {},
"outputs": [
{
Expand All @@ -1095,20 +1115,20 @@
},
{
"cell_type": "code",
"execution_count": 28,
"execution_count": 23,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"[experiment e663a7f] Trying something new\n",
"[experiment c5f8e8a] Trying something new\n",
" 1 file changed, 1 insertion(+)\n",
" create mode 100644 experiment.txt\n",
"* e663a7f Trying something new\n",
"* 258b69f I like this new name better\n",
"* f0163df I have made great progress on this critical matter.\n",
"* 8ce7775 This is our first commit\n"
"* c5f8e8a Trying something new\n",
"* db7b10a I like this new name better\n",
"* 943ee30 I have made great progress on this critical matter.\n",
"* f850212 This is our first commit\n"
]
}
],
Expand All @@ -1124,16 +1144,16 @@
},
{
"cell_type": "code",
"execution_count": 29,
"execution_count": 24,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"* 258b69f I like this new name better\n",
"* f0163df I have made great progress on this critical matter.\n",
"* 8ce7775 This is our first commit\n"
"* db7b10a I like this new name better\n",
"* 943ee30 I have made great progress on this critical matter.\n",
"* f850212 This is our first commit\n"
]
},
{
Expand All @@ -1154,19 +1174,19 @@
},
{
"cell_type": "code",
"execution_count": 30,
"execution_count": 25,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"[master 38c854c] The mainline keeps moving\n",
"[master 5bb96bd] The mainline keeps moving\n",
" 1 file changed, 1 insertion(+)\n",
"* 38c854c The mainline keeps moving\n",
"* 258b69f I like this new name better\n",
"* f0163df I have made great progress on this critical matter.\n",
"* 8ce7775 This is our first commit\n"
"* 5bb96bd The mainline keeps moving\n",
"* db7b10a I like this new name better\n",
"* 943ee30 I have made great progress on this critical matter.\n",
"* f850212 This is our first commit\n"
]
}
],
Expand All @@ -1188,19 +1208,19 @@
},
{
"cell_type": "code",
"execution_count": 33,
"execution_count": 26,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"* 38c854c The mainline keeps moving\n",
"| * e663a7f Trying something new\n",
"* 5bb96bd The mainline keeps moving\n",
"| * c5f8e8a Trying something new\n",
"|/ \n",
"* 258b69f I like this new name better\n",
"* f0163df I have made great progress on this critical matter.\n",
"* 8ce7775 This is our first commit\n"
"* db7b10a I like this new name better\n",
"* 943ee30 I have made great progress on this critical matter.\n",
"* f850212 This is our first commit\n"
]
}
],
Expand All @@ -1220,7 +1240,7 @@
},
{
"cell_type": "code",
"execution_count": 34,
"execution_count": 27,
"metadata": {},
"outputs": [
{
Expand All @@ -1240,7 +1260,7 @@
},
{
"cell_type": "code",
"execution_count": 35,
"execution_count": 28,
"metadata": {},
"outputs": [
{
Expand All @@ -1251,14 +1271,14 @@
" experiment.txt | 1 +\n",
" 1 file changed, 1 insertion(+)\n",
" create mode 100644 experiment.txt\n",
"* 83a8fc1 Merge branch 'experiment'\n",
"* f449025 Merge branch 'experiment'\n",
"|\\ \n",
"| * e663a7f Trying something new\n",
"* | 38c854c The mainline keeps moving\n",
"| * c5f8e8a Trying something new\n",
"* | 5bb96bd The mainline keeps moving\n",
"|/ \n",
"* 258b69f I like this new name better\n",
"* f0163df I have made great progress on this critical matter.\n",
"* 8ce7775 This is our first commit\n"
"* db7b10a I like this new name better\n",
"* 943ee30 I have made great progress on this critical matter.\n",
"* f850212 This is our first commit\n"
]
}
],
Expand Down
Loading

0 comments on commit 0b06229

Please # to comment.