DOC: Finish studying git topic

cortadocodes · Aug 16, 2018 · 502d1c0 · 502d1c0
1 parent 672a9b3
commit 502d1c0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -14,14 +14,14 @@ improved over time.
 ## Topics for study
 This is the list of topics I have identified for further study and investigation.
 
-| Topic              | Priority | Addressed | Details |
-| :----------------- | :-------:| :-------: | :----------------------------: |
-| Advanced use of `git` (rebasing, squashing, soft and hard pushes etc.) | 0 |  | [Here](/docs/topics/git.md) |
-| PostgreSQL | 1 |  | [Here](/docs/topics/postgresql.md) |
+| Topic              | Priority | Details | Addressed |
+| :----------------- | :-------:| :-----: | :-------: |
+| Advanced use of `git` (rebasing, squashing, soft and hard pushes etc.) | 0 | [Here](/docs/topics/git.md) | Yes |
+| PostgreSQL | 1 | [Here](/docs/topics/postgresql.md) |
 | Creating, hosting and interacting with databases | 1 |
 | CSV vs parquet vs pickle files | 1 | 
 | Interacting with and building APIs (e.g. django) | 1 | 
-| Bash and shell control in depth | 1 |  | [Here](/docs/topics/bash.md) |
+| Bash and shell control in depth | 1 | [Here](/docs/topics/bash.md) |
 | Google cloud platform | 1 |
 | The basics of Go | 1 |
 | File I/O including binary files and streams (including text wrappers and the python `io` libary) | 1 |
@@ -32,7 +32,7 @@ This is the list of topics I have identified for further study and investigation
 | Markdown vs reStructuredText | 1 |
 | Sphinx documentation | 1 |
 | `matplotlib` and `seaborn` | 1 |
-| Python packaging in depth | 1 |  | [Here](/docs/topics/packaging.md) |
+| Python packaging in depth | 1 | [Here](/docs/topics/packaging.md) |
 | Encoding | 1 |
 | NoSQL databases | 2 |
 | Context managers | 2 |

diff --git a/docs/topics/_topics_overview.md b/docs/topics/_topics_overview.md
@@ -1,14 +1,14 @@
 ## Topics for study
 This is the list of topics I have identified for further study and investigation.
 
-| Topic              | Priority | Addressed | Details |
-| :----------------- | :-------:| :-------: | :----------------------------: |
-| Advanced use of `git` (rebasing, squashing, soft and hard pushes etc.) | 0 |  | [Here](/docs/topics/git.md) |
-| PostgreSQL | 1 |  | [Here](/docs/topics/postgresql.md) |
+| Topic              | Priority | Details | Addressed |
+| :----------------- | :-------:| :-----: | :-------: |
+| Advanced use of `git` (rebasing, squashing, soft and hard pushes etc.) | 0 | [Here](/docs/topics/git.md) | Yes |
+| PostgreSQL | 1 | [Here](/docs/topics/postgresql.md) |
 | Creating, hosting and interacting with databases | 1 |
 | CSV vs parquet vs pickle files | 1 | 
 | Interacting with and building APIs (e.g. django) | 1 | 
-| Bash and shell control in depth | 1 |  | [Here](/docs/topics/bash.md) |
+| Bash and shell control in depth | 1 | [Here](/docs/topics/bash.md) |
 | Google cloud platform | 1 |
 | The basics of Go | 1 |
 | File I/O including binary files and streams (including text wrappers and the python `io` libary) | 1 |
@@ -19,7 +19,7 @@ This is the list of topics I have identified for further study and investigation
 | Markdown vs reStructuredText | 1 |
 | Sphinx documentation | 1 |
 | `matplotlib` and `seaborn` | 1 |
-| Python packaging in depth | 1 |  | [Here](/docs/topics/packaging.md) |
+| Python packaging in depth | 1 | [Here](/docs/topics/packaging.md) |
 | Encoding | 1 |
 | NoSQL databases | 2 |
 | Context managers | 2 |

diff --git a/docs/topics/git.md b/docs/topics/git.md
@@ -6,14 +6,14 @@
 | Configuring and inspecting remotes (`remote add`, `remote rm`, `remote rename`, `remote show`) | Udacity course, "Pro Git" | Yes |
 | Using remotes (`push`, `pull`, `fetch`, `clone`) | Udacity course | Yes |
 | Github (forking, pull requests, general collaboration) | Udacity course, past experience | Yes |
-| Resets (soft and hard) | "Pro Git" | Yes |
+| Resets (soft, mixed and hard) | "Pro Git" | Yes |
 | Rebasing | "Pro Git"| Yes |
 | Interactive rebasing and squashing | "Pro Git" | Yes |
-| `git stash` | "Pro Git" | Yes |
 | Manipulating git history (amending commit messages; editing, reordering and removing previous commits) | "Pro Git" | Yes |
+| `git stash` | "Pro Git" | Yes |
 | The meaning of `^` and `~` in relation to a commit | "Pro Git" | Yes |
 | Tags/releases | "Pro Git" | Yes |
-| Commit hooks |  |  |
+| Commit hooks | "Pro Git"  | Yes |
 
 ## Courses:
 * [Udacity: How to use Git and GitHub](https://eu.udacity.com/course/how-to-use-git-and-github--ud775)