Skip to content

Commit 0225cc8

Browse files
authored
Linkify
1 parent bec8156 commit 0225cc8

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

content/blog/2025-10-08-git-material.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ On January 14, 2025, we held an Open House session on "Git masterclass". Educato
3737
- [Intermediate Git](https://docs.google.com/document/d/1lUyXwlvU4NJLizreJc4LD6JISk8Ev9_L2LUmxBqaFys/edit?usp=sharing)
3838
- [Expert Git](https://docs.google.com/document/d/1vogIBg0U5kKXrTAHTSO3xeK33Oyq4VTAwDxwDr8VSSg/edit?usp=sharing)
3939

40-
- [Collaborative version control with Git and GitHub by **e-Science Center** ](https://github.com/esciencecenter-digital-skills/git-lesson)
40+
- [Collaborative version control with Git and GitHub by **NL e-Science Center** ](https://github.com/esciencecenter-digital-skills/git-lesson)
4141

4242
- **CodeRefinery**
4343
- [Introductory Git](https://coderefinery.github.io/git-intro/)
@@ -88,16 +88,16 @@ During the open house session we collected topics we would find interesting to h
8888
- [Visualizing Git Concepts with D3](http://onlywei.github.io/explain-git-with-d3/)
8989
- Collaborate on a meaningful example to convey mental model/understanding which would still be motivating
9090
- Recovering from making commits to the wrong branch
91-
- https://coderefinery.github.io/git-intro/recovering/ (materials exist but we typically don't manage to teach this due to time in our "normal" workshop)
91+
- <https://coderefinery.github.io/git-intro/recovering/> (materials exist but we typically don't manage to teach this due to time in our "normal" workshop)
9292
- Undoing/partially doing add (command-line or GUI-assisted)
93-
- https://kernelnewbies.org/FirstKernelPatch#CommittingChanges
93+
- <https://kernelnewbies.org/FirstKernelPatch#CommittingChanges>
9494
- Editing a previous commit (log, splitting, reverting)
9595
- Available material which covers multiple of the above:
96-
- https://mmesiti.github.io/git-intermediate/git-states/
97-
- http://www.ndpsoftware.com/git-cheatsheet.html#loc=workspace;
98-
- https://firstaidgit.io/
96+
- <https://mmesiti.github.io/git-intermediate/git-states/>
97+
- <http://www.ndpsoftware.com/git-cheatsheet.html#loc=workspace;>
98+
- <https://firstaidgit.io/>
9999
- Using the reflog to recover from bad resets
100-
- https://ohshitgit.com/#magic-time-machine
100+
- <https://ohshitgit.com/#magic-time-machine>
101101

102102

103103
### Changing history
@@ -111,7 +111,7 @@ During the open house session we collected topics we would find interesting to h
111111

112112
- Interactive rebase to squash/delete/re-order commits
113113
- Gradually introduce rebase: Amending/Fixup first, then interactive rebase. Do not overwhelm with full power, links into creating clearer history while working.
114-
- XKCD comic as motivation to git rebase. This repository implements the git history of that comic and fixes it: https://github.com/ssciwr/git-rebase-xkcd-example (Details in Heidelberg university material)
114+
- XKCD comic as motivation to git rebase. This repository implements the git history of that comic and fixes it: <https://github.com/ssciwr/git-rebase-xkcd-example> (Details in Heidelberg university material)
115115
- Squashing commits into a logical unit using reset
116116

117117
- Creating clearer history while working
@@ -127,21 +127,21 @@ During the open house session we collected topics we would find interesting to h
127127
- Which branches and commit have you worked on? (Analysing/Debugging history - Meta Level)
128128
- Searching through code changes with "pickaxe"
129129
- Finding a commit that introduced a bug with git annotate or bisect
130-
- Example repository with two bugs hidden in history (1 functional, 1 performance): https://github.com/ssciwr/git-bisect-example (Details in Uni Heidelberg material)
130+
- Example repository with two bugs hidden in history (1 functional, 1 performance): <https://github.com/ssciwr/git-bisect-example> (Details in Uni Heidelberg material)
131131

132132

133133
### Collaborative workflows
134134

135135
- Importance of having a workflow: contributing changes is key for reproducibility, many users fork a project and change it and then just use their own version. Also trains useful transferable skills to industry/research software engineering.
136-
- https://carpentries-incubator.github.io/advanced-git/07-branching-models/index.html
137-
- https://carpentries-incubator.github.io/gitlab-novice/04-collaboration.html
138-
- (not sure where this goes) https://carpentries-incubator.github.io/collaborative-git-and-github-lesson/aio.html
136+
- <https://carpentries-incubator.github.io/advanced-git/07-branching-models/index.html>
137+
- <https://carpentries-incubator.github.io/gitlab-novice/04-collaboration.html>
138+
- (not sure where this goes) <https://carpentries-incubator.github.io/collaborative-git-and-github-lesson/aio.html>
139139
- Git project guidelines, i.e., no merge request without an issue, only a limited number of people merge to master/main, etc. A collection of the most important guidelines, familiarize participants with different options.
140140
- Forking workflow
141-
- https://carpentries-incubator.github.io/advanced-git/09-forking/index.html
142-
- https://carpentries-incubator.github.io/git-novice-branch-pr/10-pull-requests/
141+
- <https://carpentries-incubator.github.io/advanced-git/09-forking/index.html>
142+
- <https://carpentries-incubator.github.io/git-novice-branch-pr/10-pull-requests/>
143143
- GitFlow, different variations, with or without a development branch, feature branches, hotfixes
144-
- https://carpentries-incubator.github.io/advanced-git/08-gitflow/index.html
144+
- <https://carpentries-incubator.github.io/advanced-git/08-gitflow/index.html>
145145
- [Blog Post on why 'gitflow' may not be a good fit for your project](https://medium.com/@onatkorucu/dont-use-git-flow-in-2023-move-to-trunk-based-development-instead-1ac5bd7cb10)
146146
- [Blog Post on alternatives to Gitflow](https://moldstud.com/articles/p-what-are-some-alternative-workflows-to-gitflow-that-developers-can-consider)
147147
- Working with PR/MRs and code review
@@ -182,7 +182,7 @@ During the open house session we collected topics we would find interesting to h
182182
- how to customize fish shell for Git
183183
- how to use GUI for line-based "git add -p" commands, difftool, mergetool
184184
- [difftastic](https://difftastic.wilfred.me.uk/)
185-
- https://carpentries-incubator.github.io/advanced-git/16-tools/index.html
185+
- <https://carpentries-incubator.github.io/advanced-git/16-tools/index.html>
186186
- excellent tool for diffing and integrates easily with Git (see [git configuration](https://difftastic.wilfred.me.uk/git.html))
187187
- [delta](https://github.com/dandavison/delta) - syntax-highlighting pager that can be customized
188188
- meld as difftool/mergetool

0 commit comments

Comments
 (0)