Mirror of
feat(content): write uncommon git commands post (#173)
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
authored by
Felix Schneider
coderabbitai[bot]
and committed by
GitHub
d6506d04
5dc2a15b
+115
public/blog/uncommon-git-commands.jpg
public/blog/uncommon-git-commands.jpg
This is a binary file and will not be displayed.
+106
src/content/docs/blog/uncommon-git-commands.mdx
+106
src/content/docs/blog/uncommon-git-commands.mdx
···
1
+
---
2
+
title: Uncommon Git Commands
3
+
date: 2026-02-26
4
+
description: This blog lists some git commands that can be pretty useful but are so rarely used, that you always forget them.
5
+
tags:
6
+
- Education
7
+
authors:
8
+
- trueberryless
9
+
cover:
10
+
alt: A solitary tree stands in a vast green field under a clear blue sky.
11
+
image: ../../../../public/blog/uncommon-git-commands.jpg
12
+
giscus: true
13
+
---
14
+
15
+
I like to use the `git` CLI. I have tried UIs like GitKraken, Fork or GitHub Desktop. I don't like them.
16
+
17
+
The majority of commands can be remembered after a short amount of time because you use them daily. However, there are some commands you only need here and there, which makes them really difficult to memorize. Every time I need them, I haven't used them for so long that I forget which option it was. Then I have to look them up again, feeling frustrated and uncool for not knowing Git by heart. It's embarrassing.
18
+
19
+
So I decided to write this little post, which doesn't help memorizing them, but I'll always know where I can look them up quickly 😅
20
+
21
+
## Checkout a remote branch on fork
22
+
23
+
When contributing to open source, it is common that you want to checkout a branch of the upstream branch, that doesn't exist in your remote fork yet. Neither does it exist in your local repository. Now when it comes to checking out a remote branch on a local repository, `git switch` is your friend. Just remember to fetch the upstream, so git knows the reference you want to track. However, what if the branch is not in _your_ remote repository - your fork.
24
+
25
+
I usually have set up the original remote repository as the upstream repo locally, which can be done with:
26
+
27
+
```bash
28
+
git remote add upstream https://github.com/<org>/<repo>
29
+
```
30
+
31
+
With this information, git can then fetch the upstream:
32
+
33
+
```bash
34
+
git fetch upstream
35
+
```
36
+
37
+
And now comes the magic: Create and checkout a branch, that until then only exists in the original remote repo with:
38
+
39
+
```bash
40
+
git checkout -b <branch> upstream/<branch>
41
+
```
42
+
43
+
I know that it is pretty annoying that you have to specify the branch name two times, but in theory you could name the local branch differently.
44
+
45
+
Also don't forget that this branch does not yet exist in your remote fork, but you can push it easily with:
46
+
47
+
```bash
48
+
git push -u origin <branch>
49
+
```
50
+
51
+
## Rename the commit message of an older commit
52
+
53
+
:::note
54
+
Renaming commits is not recommended when the commit is already pushed to the remote as you are changing the commit history for everyone.
55
+
:::
56
+
57
+
If you want to rename the last commit, just use:
58
+
59
+
```bash
60
+
git commit --amend
61
+
```
62
+
63
+
When you already have multiple local commits, you have to start an interactive rebase with:
64
+
65
+
```bash
66
+
git rebase -i HEAD~3
67
+
```
68
+
69
+
Here, 3 is the number of commits you want to adapt. If your commit is back 10 commits, you need to put a 10 there instead.
70
+
71
+
Git will open your favourite editor with some text like:
72
+
73
+
```
74
+
pick 64e085f Commit Message 1
75
+
pick e5f607a Commit Message 2
76
+
pick a9b0c1d Commit Message 3
77
+
```
78
+
79
+
You can now edit this text like a normal file and replace all the `pick` keywords where you want to change the commit message with `reword`. After you save and close the file, git will repeatedly open text files with the old commit message, which you can freely edit to your likings. After you adapted everything you wanted and close the last file, the rebase is finished and you can check your corrections with:
80
+
81
+
```bash
82
+
git log --oneline
83
+
```
84
+
85
+
Interactive rebasing is incredibly useful, as other options like `squash`, `break` or even `exec` are available. Just keep in mind that it makes more sense to do this on a branch where only you work to avoid team friction.
86
+
87
+
## Summary
88
+
89
+
**🛰️ Track Upstream Branch**
90
+
> `git fetch upstream && git checkout -b <branch> upstream/<branch>`
91
+
>
92
+
> Fetches the latest references from the original repository and creates a local branch that tracks the upstream version in one logical flow.
93
+
94
+
**🔄 Rename Older Commits**
95
+
> `git rebase -i HEAD~n`
96
+
>
97
+
> Use this to rewrite history. In the interactive editor, change `pick` to `reword` for any of the last `n` commits you want to modify.
98
+
99
+
## Resources
100
+
101
+
Here are some helpful resources for learning git and other situations you often find yourself in:
102
+
103
+
- https://learngitbranching.js.org/
104
+
- https://ohshitgit.com/
105
+
106
+
That's it for now, more useful uncommon git commands might be added in the future!
+9
src/content/docs/credits.mdx
+9
src/content/docs/credits.mdx
···
351
351
usedOnUrl="/blog/starlight-dropdown-and-list-together"
352
352
/>
353
353
<ImageCredit
354
+
image="/public/blog/uncommon-git-commands.jpg"
355
+
title="Green Leaf Tree Under Blue Sky"
356
+
author="niko photos"
357
+
authorUrl="https://unsplash.com/@niko_photos"
358
+
sourceUrl="https://unsplash.com/photos/green-leaf-tree-under-blue-sky-tGTVxeOr_Rs"
359
+
usedOn="Uncommon Git Commands"
360
+
usedOnUrl="/blog/uncommon-git-commands"
361
+
/>
362
+
<ImageCredit
354
363
image="/public/blog/deep-thoughts.jpg"
355
364
title="Green Leafed Tree on Desert"
356
365
author="Damian Denis"