Skip to content

Commit 0b06229

Browse files
fperezfperez
committed
Final changes during lecture
1 parent 8286d86 commit 0b06229

File tree

3 files changed

+157
-97
lines changed

3 files changed

+157
-97
lines changed

‎01-Intro Jupyter Notebook.ipynb‎

Lines changed: 40 additions & 0 deletions
Large diffs are not rendered by default.

‎03-Git-Tutorial.ipynb‎

Lines changed: 88 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,26 @@
377377
"### `git init`: create an empty repository"
378378
]
379379
},
380+
{
381+
"cell_type": "code",
382+
"execution_count": 3,
383+
"metadata": {},
384+
"outputs": [
385+
{
386+
"data": {
387+
"text/plain": [
388+
"'/Users/fperez/teach/icesat2/intro-jupyter-git'"
389+
]
390+
},
391+
"execution_count": 3,
392+
"metadata": {},
393+
"output_type": "execute_result"
394+
}
395+
],
396+
"source": [
397+
"%pwd"
398+
]
399+
},
380400
{
381401
"cell_type": "code",
382402
"execution_count": 4,
@@ -439,9 +459,9 @@
439459
"output_type": "stream",
440460
"text": [
441461
"total 0\n",
442-
"drwxr-xr-x 3 fperez staff 96 Jun 17 02:09 .\n",
443-
"drwxr-xr-x 27 fperez staff 864 Jun 17 02:09 ..\n",
444-
"drwxr-xr-x 9 fperez staff 288 Jun 17 02:09 .git\n"
462+
"drwxr-xr-x 3 fperez staff 96 Jun 19 08:52 .\n",
463+
"drwxr-xr-x 31 fperez staff 992 Jun 19 08:52 ..\n",
464+
"drwxr-xr-x 9 fperez staff 288 Jun 19 08:52 .git\n"
445465
]
446466
}
447467
],
@@ -464,13 +484,13 @@
464484
"output_type": "stream",
465485
"text": [
466486
"total 24\n",
467-
"-rw-r--r-- 1 fperez staff 23 Jun 17 02:09 HEAD\n",
468-
"-rw-r--r-- 1 fperez staff 137 Jun 17 02:09 config\n",
469-
"-rw-r--r-- 1 fperez staff 73 Jun 17 02:09 description\n",
470-
"drwxr-xr-x 13 fperez staff 416 Jun 17 02:09 hooks\n",
471-
"drwxr-xr-x 3 fperez staff 96 Jun 17 02:09 info\n",
472-
"drwxr-xr-x 4 fperez staff 128 Jun 17 02:09 objects\n",
473-
"drwxr-xr-x 4 fperez staff 128 Jun 17 02:09 refs\n"
487+
"-rw-r--r-- 1 fperez staff 23 Jun 19 08:52 HEAD\n",
488+
"-rw-r--r-- 1 fperez staff 137 Jun 19 08:52 config\n",
489+
"-rw-r--r-- 1 fperez staff 73 Jun 19 08:52 description\n",
490+
"drwxr-xr-x 13 fperez staff 416 Jun 19 08:52 hooks\n",
491+
"drwxr-xr-x 3 fperez staff 96 Jun 19 08:52 info\n",
492+
"drwxr-xr-x 4 fperez staff 128 Jun 19 08:52 objects\n",
493+
"drwxr-xr-x 4 fperez staff 128 Jun 19 08:52 refs\n"
474494
]
475495
}
476496
],
@@ -578,14 +598,14 @@
578598
},
579599
{
580600
"cell_type": "code",
581-
"execution_count": 16,
601+
"execution_count": 11,
582602
"metadata": {},
583603
"outputs": [
584604
{
585605
"name": "stdout",
586606
"output_type": "stream",
587607
"text": [
588-
"[master (root-commit) 8ce7775] This is our first commit\n",
608+
"[master (root-commit) f850212] This is our first commit\n",
589609
" 1 file changed, 1 insertion(+)\n",
590610
" create mode 100644 file1.txt\n"
591611
]
@@ -618,16 +638,16 @@
618638
},
619639
{
620640
"cell_type": "code",
621-
"execution_count": 17,
641+
"execution_count": 12,
622642
"metadata": {},
623643
"outputs": [
624644
{
625645
"name": "stdout",
626646
"output_type": "stream",
627647
"text": [
628-
"commit 8ce7775da6ee3d042f78924aa1904154fd4c92f8\n",
648+
"commit f850212ca594f6e4c4ba246f1567f1d21e8869a8\n",
629649
"Author: Fernando Perez <Fernando.Perez@berkeley.edu>\n",
630-
"Date: Wed Sep 6 23:24:25 2017 -0700\n",
650+
"Date: Wed Jun 19 08:52:41 2019 -0700\n",
631651
"\n",
632652
" This is our first commit\n"
633653
]
@@ -656,7 +676,7 @@
656676
},
657677
{
658678
"cell_type": "code",
659-
"execution_count": 18,
679+
"execution_count": 13,
660680
"metadata": {
661681
"collapsed": true,
662682
"jupyter": {
@@ -680,7 +700,7 @@
680700
},
681701
{
682702
"cell_type": "code",
683-
"execution_count": 19,
703+
"execution_count": 14,
684704
"metadata": {},
685705
"outputs": [
686706
{
@@ -752,14 +772,14 @@
752772
},
753773
{
754774
"cell_type": "code",
755-
"execution_count": 20,
775+
"execution_count": 15,
756776
"metadata": {},
757777
"outputs": [
758778
{
759779
"name": "stdout",
760780
"output_type": "stream",
761781
"text": [
762-
"[master f0163df] I have made great progress on this critical matter.\n",
782+
"[master 943ee30] I have made great progress on this critical matter.\n",
763783
" 1 file changed, 1 insertion(+)\n"
764784
]
765785
}
@@ -787,22 +807,22 @@
787807
},
788808
{
789809
"cell_type": "code",
790-
"execution_count": 21,
810+
"execution_count": 16,
791811
"metadata": {},
792812
"outputs": [
793813
{
794814
"name": "stdout",
795815
"output_type": "stream",
796816
"text": [
797-
"commit f0163df7db81ece0345dccc6d975dec9d4d7529f\n",
817+
"commit 943ee30cdfc3a32f4b6f8f8c6b1ef4f6ca505624\n",
798818
"Author: Fernando Perez <Fernando.Perez@berkeley.edu>\n",
799-
"Date: Wed Sep 6 23:24:34 2017 -0700\n",
819+
"Date: Wed Jun 19 08:52:56 2019 -0700\n",
800820
"\n",
801821
" I have made great progress on this critical matter.\n",
802822
"\n",
803-
"commit 8ce7775da6ee3d042f78924aa1904154fd4c92f8\n",
823+
"commit f850212ca594f6e4c4ba246f1567f1d21e8869a8\n",
804824
"Author: Fernando Perez <Fernando.Perez@berkeley.edu>\n",
805-
"Date: Wed Sep 6 23:24:25 2017 -0700\n",
825+
"Date: Wed Jun 19 08:52:41 2019 -0700\n",
806826
"\n",
807827
" This is our first commit\n"
808828
]
@@ -824,15 +844,15 @@
824844
},
825845
{
826846
"cell_type": "code",
827-
"execution_count": 22,
847+
"execution_count": 17,
828848
"metadata": {},
829849
"outputs": [
830850
{
831851
"name": "stdout",
832852
"output_type": "stream",
833853
"text": [
834-
"* f0163df I have made great progress on this critical matter.\n",
835-
"* 8ce7775 This is our first commit\n"
854+
"* 943ee30 I have made great progress on this critical matter.\n",
855+
"* f850212 This is our first commit\n"
836856
]
837857
}
838858
],
@@ -852,15 +872,15 @@
852872
},
853873
{
854874
"cell_type": "code",
855-
"execution_count": 23,
875+
"execution_count": 18,
856876
"metadata": {},
857877
"outputs": [
858878
{
859879
"name": "stdout",
860880
"output_type": "stream",
861881
"text": [
862-
"* f0163df I have made great progress on this critical matter.\n",
863-
"* 8ce7775 This is our first commit\n"
882+
"* 943ee30 I have made great progress on this critical matter.\n",
883+
"* f850212 This is our first commit\n"
864884
]
865885
}
866886
],
@@ -891,7 +911,7 @@
891911
},
892912
{
893913
"cell_type": "code",
894-
"execution_count": 24,
914+
"execution_count": 19,
895915
"metadata": {},
896916
"outputs": [
897917
{
@@ -924,20 +944,20 @@
924944
},
925945
{
926946
"cell_type": "code",
927-
"execution_count": 25,
947+
"execution_count": 20,
928948
"metadata": {},
929949
"outputs": [
930950
{
931951
"name": "stdout",
932952
"output_type": "stream",
933953
"text": [
934-
"[master 258b69f] I like this new name better\n",
954+
"[master db7b10a] I like this new name better\n",
935955
" 1 file changed, 0 insertions(+), 0 deletions(-)\n",
936956
" rename file1.txt => file-newname.txt (100%)\n",
937957
"Let's look at the log again:\n",
938-
"* 258b69f I like this new name better\n",
939-
"* f0163df I have made great progress on this critical matter.\n",
940-
"* 8ce7775 This is our first commit\n"
958+
"* db7b10a I like this new name better\n",
959+
"* 943ee30 I have made great progress on this critical matter.\n",
960+
"* f850212 This is our first commit\n"
941961
]
942962
}
943963
],
@@ -1044,7 +1064,7 @@
10441064
},
10451065
{
10461066
"cell_type": "code",
1047-
"execution_count": 26,
1067+
"execution_count": 21,
10481068
"metadata": {},
10491069
"outputs": [
10501070
{
@@ -1074,7 +1094,7 @@
10741094
},
10751095
{
10761096
"cell_type": "code",
1077-
"execution_count": 27,
1097+
"execution_count": 22,
10781098
"metadata": {},
10791099
"outputs": [
10801100
{
@@ -1095,20 +1115,20 @@
10951115
},
10961116
{
10971117
"cell_type": "code",
1098-
"execution_count": 28,
1118+
"execution_count": 23,
10991119
"metadata": {},
11001120
"outputs": [
11011121
{
11021122
"name": "stdout",
11031123
"output_type": "stream",
11041124
"text": [
1105-
"[experiment e663a7f] Trying something new\n",
1125+
"[experiment c5f8e8a] Trying something new\n",
11061126
" 1 file changed, 1 insertion(+)\n",
11071127
" create mode 100644 experiment.txt\n",
1108-
"* e663a7f Trying something new\n",
1109-
"* 258b69f I like this new name better\n",
1110-
"* f0163df I have made great progress on this critical matter.\n",
1111-
"* 8ce7775 This is our first commit\n"
1128+
"* c5f8e8a Trying something new\n",
1129+
"* db7b10a I like this new name better\n",
1130+
"* 943ee30 I have made great progress on this critical matter.\n",
1131+
"* f850212 This is our first commit\n"
11121132
]
11131133
}
11141134
],
@@ -1124,16 +1144,16 @@
11241144
},
11251145
{
11261146
"cell_type": "code",
1127-
"execution_count": 29,
1147+
"execution_count": 24,
11281148
"metadata": {},
11291149
"outputs": [
11301150
{
11311151
"name": "stdout",
11321152
"output_type": "stream",
11331153
"text": [
1134-
"* 258b69f I like this new name better\n",
1135-
"* f0163df I have made great progress on this critical matter.\n",
1136-
"* 8ce7775 This is our first commit\n"
1154+
"* db7b10a I like this new name better\n",
1155+
"* 943ee30 I have made great progress on this critical matter.\n",
1156+
"* f850212 This is our first commit\n"
11371157
]
11381158
},
11391159
{
@@ -1154,19 +1174,19 @@
11541174
},
11551175
{
11561176
"cell_type": "code",
1157-
"execution_count": 30,
1177+
"execution_count": 25,
11581178
"metadata": {},
11591179
"outputs": [
11601180
{
11611181
"name": "stdout",
11621182
"output_type": "stream",
11631183
"text": [
1164-
"[master 38c854c] The mainline keeps moving\n",
1184+
"[master 5bb96bd] The mainline keeps moving\n",
11651185
" 1 file changed, 1 insertion(+)\n",
1166-
"* 38c854c The mainline keeps moving\n",
1167-
"* 258b69f I like this new name better\n",
1168-
"* f0163df I have made great progress on this critical matter.\n",
1169-
"* 8ce7775 This is our first commit\n"
1186+
"* 5bb96bd The mainline keeps moving\n",
1187+
"* db7b10a I like this new name better\n",
1188+
"* 943ee30 I have made great progress on this critical matter.\n",
1189+
"* f850212 This is our first commit\n"
11701190
]
11711191
}
11721192
],
@@ -1188,19 +1208,19 @@
11881208
},
11891209
{
11901210
"cell_type": "code",
1191-
"execution_count": 33,
1211+
"execution_count": 26,
11921212
"metadata": {},
11931213
"outputs": [
11941214
{
11951215
"name": "stdout",
11961216
"output_type": "stream",
11971217
"text": [
1198-
"* 38c854c The mainline keeps moving\n",
1199-
"| * e663a7f Trying something new\n",
1218+
"* 5bb96bd The mainline keeps moving\n",
1219+
"| * c5f8e8a Trying something new\n",
12001220
"|/ \n",
1201-
"* 258b69f I like this new name better\n",
1202-
"* f0163df I have made great progress on this critical matter.\n",
1203-
"* 8ce7775 This is our first commit\n"
1221+
"* db7b10a I like this new name better\n",
1222+
"* 943ee30 I have made great progress on this critical matter.\n",
1223+
"* f850212 This is our first commit\n"
12041224
]
12051225
}
12061226
],
@@ -1220,7 +1240,7 @@
12201240
},
12211241
{
12221242
"cell_type": "code",
1223-
"execution_count": 34,
1243+
"execution_count": 27,
12241244
"metadata": {},
12251245
"outputs": [
12261246
{
@@ -1240,7 +1260,7 @@
12401260
},
12411261
{
12421262
"cell_type": "code",
1243-
"execution_count": 35,
1263+
"execution_count": 28,
12441264
"metadata": {},
12451265
"outputs": [
12461266
{
@@ -1251,14 +1271,14 @@
12511271
" experiment.txt | 1 +\n",
12521272
" 1 file changed, 1 insertion(+)\n",
12531273
" create mode 100644 experiment.txt\n",
1254-
"* 83a8fc1 Merge branch 'experiment'\n",
1274+
"* f449025 Merge branch 'experiment'\n",
12551275
"|\\ \n",
1256-
"| * e663a7f Trying something new\n",
1257-
"* | 38c854c The mainline keeps moving\n",
1276+
"| * c5f8e8a Trying something new\n",
1277+
"* | 5bb96bd The mainline keeps moving\n",
12581278
"|/ \n",
1259-
"* 258b69f I like this new name better\n",
1260-
"* f0163df I have made great progress on this critical matter.\n",
1261-
"* 8ce7775 This is our first commit\n"
1279+
"* db7b10a I like this new name better\n",
1280+
"* 943ee30 I have made great progress on this critical matter.\n",
1281+
"* f850212 This is our first commit\n"
12621282
]
12631283
}
12641284
],

0 commit comments

Comments
 (0)