|
8 | 8 | embed-resources: true |
9 | 9 | --- |
10 | 10 |
|
| 11 | +```{=html} |
| 12 | +<style> |
| 13 | +.filelist { |
| 14 | + font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, monospace; |
| 15 | + background-color: #f5f7fa; |
| 16 | + padding: 0.75em 1em; |
| 17 | +} |
| 18 | +</style> |
| 19 | +``` |
| 20 | + |
11 | 21 | # Preamble |
12 | 22 |
|
13 | 23 | ## Welcome to "PHS 7045: Advanced Programming" |
@@ -97,6 +107,34 @@ Throughout the course, we will be using the following tools: |
97 | 107 |
|
98 | 108 | --- |
99 | 109 |
|
| 110 | +## Why do we care |
| 111 | + |
| 112 | +::: {.columns} |
| 113 | + |
| 114 | +::: {.column width="50%" .fragment} |
| 115 | +You might have seen this... |
| 116 | + |
| 117 | +```{.filelist} |
| 118 | +mydocument.txt |
| 119 | +mydocumentversion2.txt |
| 120 | +mydocumentwithrevision.txt |
| 121 | +mydocumentfinal.txt |
| 122 | +``` |
| 123 | +::: |
| 124 | + |
| 125 | +::: {.column width="50%" .fragment} |
| 126 | +Or even this… |
| 127 | + |
| 128 | +```{.filelist} |
| 129 | +mydocument2016-01-06.txt |
| 130 | +mydocument2016-01-08.txt |
| 131 | +``` |
| 132 | +::: |
| 133 | + |
| 134 | +::: |
| 135 | + |
| 136 | +--- |
| 137 | + |
100 | 138 | ## Why do we care |
101 | 139 |
|
102 | 140 | Have you ever: |
@@ -161,6 +199,53 @@ In these cases, and no doubt others, a version control system should make your l |
161 | 199 |
|
162 | 200 | --- |
163 | 201 |
|
| 202 | +## A (Very) Short History of Git |
| 203 | + |
| 204 | +- **1991–2002**: Linux kernel developed via emailed patches, no formal version control |
| 205 | + |
| 206 | +```{.email} |
| 207 | +From: torvalds@klaava.Helsinki.FI (Linus Benedict Torvalds) |
| 208 | +Newsgroups: comp.os.minix |
| 209 | +Subject: What would you like to see most in minix? |
| 210 | +Summary: small poll for my new operating system |
| 211 | +Date: 25 Aug 91 20:57:08 GMT |
| 212 | +Organization: University of Helsinki |
| 213 | +
|
| 214 | +Hello everybody out there using minix - |
| 215 | +
|
| 216 | +I'm doing a (free) operating system (just a hobby, won't be big and |
| 217 | +professional like gnu) for 386(486) AT clones. This has been brewing |
| 218 | +since april, and is starting to get ready. I'd like any feedback on |
| 219 | +things people like/dislike in minix, as my OS resembles it somewhat |
| 220 | +(same physical layout of the file-system (due to practical reasons) |
| 221 | +among other things). |
| 222 | +
|
| 223 | +I've currently ported bash(1.08) and gcc(1.40), and things seem to work. |
| 224 | +This implies that I'll get something practical within a few months, and |
| 225 | +I'd like to know what features most people would want. Any suggestions |
| 226 | +are welcome, but I won't promise I'll implement them :-) |
| 227 | +
|
| 228 | +Linus (torvalds@kruuna.helsinki.fi) |
| 229 | +
|
| 230 | +PS. Yes - it's free of any minix code, and it has a multi-threaded fs. |
| 231 | +It is NOT protable (uses 386 task switching etc), and it probably never |
| 232 | +will support anything other than AT-harddisks, as that's all I have :-(. |
| 233 | +``` |
| 234 | + |
| 235 | +--- |
| 236 | + |
| 237 | +## A (Very) Short History of Git (cont'd) |
| 238 | + |
| 239 | +::: {.incremental} |
| 240 | +- **2002**: Kernel team adopts **BitKeeper**, a proprietary DVCS, free to use for open source projects |
| 241 | +- **April 2005**: Free license revoked after a licensing dispute |
| 242 | +- **April 2005**: Torvalds writes **Git** from scratch in ~two weeks |
| 243 | +- **July 2005**: Torvalds hands maintenance to **Junio Hamano**, who still leads Git development today |
| 244 | +- **2008 onward**: **GitHub** launches, making distributed workflows (fork/branch/PR) mainstream far beyond kernel hacking |
| 245 | +::: |
| 246 | + |
| 247 | +--- |
| 248 | + |
164 | 249 | ## Git: The stupid content tracker |
165 | 250 |
|
166 | 251 | ::: {.r-fit-text} |
|
0 commit comments