Git on Kenno's Open Note

How to undo a pushed commit

Sat, 20 Dec 2025 01:33:59 +1100

Oops… I just accidentally pushed a git commit containing code with a secret in plain text to a remote repo! Though it’s a private repository, I want to clean this mess up for security best practice. So, let’s fix it!

Here are the last two commits. The secret resides in one of the files from the “add argocd infra to git” commit.

$ git log -2
commit fe7b0510edc4fb160a16421352ba598e3f62703e (HEAD -> main, origin/main, origin/HEAD)
Author: kenno <kenno@example.com>
Date:   Sat Dec 20 00:59:36 2025 +1100

    add argocd infra to git
    
commit c5a75ae14cf3528db1fea7677e2bdb54167037cd
Author: kenno <kenno@example.com>
Date:   Thu Dec 18 14:38:17 2025 +1100

    add basic auth middleware to longhorn httproute

Since the commit had already been pushed to a remote repository, simply “undoing” the commit locally is not enough; it is required to overwrite the remote history.

How to revert a single file to its state in main in branch

Fri, 28 Feb 2025 15:19:48 +1100

I want to reset a file stored in a git repo to its state as the main branch, and I kept forgetting how to do this.

So here is how, just to remind my future self.

➜ git status
On branch main
Your branch is up to date with 'origin/main'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   kube-prometheus-stack-values.yaml

no changes added to commit (use "git add" and/or "git commit -a")

The above output shows that there is a modified file, kube-prometheus-stack-values.yaml that is not yet staged for commit.

Changing Hugo Theme

Tue, 20 Jun 2023 22:36:37 +1000

Had you visited this blog recently, you may have noticed that the blog’s theme has changed.

Here is a quick note on how I changed the theme of this blog from cayman-hugo-theme to PaperMod. For a little background, Hugo themes are installed as git submodule. Want a quick recap on how to use Git Submodule? Here is a good content [0].

First, the current theme needs to be removed:

$ git submodule
4a924cef54081b61530a30bd69d442ae99916561 themes/cayman-hugo-theme (heads/master)

$ git submodule deinit "themes/cayman-hugo-theme"
$ git rm "themes/cayman-hugo-theme"

$ git commit -m 'remove theme cayman-hugo-theme'

Add a new theme, PaperMod [2] as the submodule.

$ git submodule add --depth=1 https://github.com/adityatelange/hugo-PaperMod.git themes/PaperMod
$ git add .gitmodules
$ git add config.yml

$ git commit -m 'change theme to PaperMod'
$ git push

Note: As each Hugo theme contains specific parameters, I also had to update the config.yml required by this new theme. A copy of a sample config.yml is available at the theme’s exampleSite [1].

How to add additional remote git repository

Sat, 03 Sep 2022 12:24:10 +1000

Though it’s not very common in my daily work, I occasionally need to add additional remote Git repositories mainly for pushing. In fact, I did this about 4 to 5 times already, and thought that it’d be the last time.

Today, I need do this again, and I forgot!

Currently, I have the following remote repository set for ‘origin’:

❯ git remote -v
origin  git@git.homeserver.local:kenno/ansible.git (fetch)
origin  git@git.homeserver.local:kenno/ansible.git (push)

I wanted to add https://kenno@gitea.homeserver.local/kenno/ansible.git as the additional repo for pushing.

Installing Xcode Command Line Tools

Thu, 25 Feb 2021 23:03:17 +1100

I need to use git on command line on macOS 11 (Big Sur), and git comes with command line developer tools. Here is how it can be done on macOS:

❯ xcode-select --install
xcode-select: note: install requested for command line developer tools

On a side note, I notice that every time there is an update to Big Sur, I also have to re-install this Xcode Command Line Tools.

Ref:

kamermanpr/install-xcodeCLT-homebrew-git.md

FreeBSD git fatal: Unable to find remote helper for 'https'

Fri, 01 Jul 2016 23:15:03 +0000

I just found out that git is not fully functional on my FreeBSD (11) box. It was installed from port (using portmaster git). I can clone a repo using SSH key, but not with HTTPS.

I’m not quite sure if it’s always been this way. Here is how to fix it:

Reinstall curl

# pkg remove curl
# portmaster curl

Reinstall git

# pkg remove git
# portmaster git

Why did I install git from port? Well, ‘cuz there is no binary package for FreeBSD 11 arm, which runs on my Raspberry Pi B+.

ការបញ្ចូល git ក្នុង Raspberry Pi ដើរ FreeBSD 11

Fri, 29 May 2015 21:36:56 +0000

ដោយសារពុំមាន កញ្ចប់បាយនារី (binary package) នៃ git យើងត្រូវបញ្ចូល gitពីសោះខូត ដូចខាងក្រោម៖

# cd /usr/ports/devel/git
# make install clean

សង្ឃឹមថាថ្ងៃក្រោយឆាប់ៗ កញ្ចប់បាយនារី នឹងបានបង្កើតឡើង ព្រោះខំផាយពី សោះខូតយើតណាស់ ជាពិសេសពេលខំផាយវាលើ រ៉ាស់ប៊ែរីផាយ។

Turn color on for git status

Thu, 26 Sep 2013 03:49:33 +0000

The following command will update the Git’s global configuration to set the color.ui to true.

$ git config --global color.ui true

Ref: https://ask.fedoraproject.org/question/10434

Beautify gitk font on Debian/Ubuntu

Sun, 04 Sep 2011 11:35:11 +0000

Install tk8.5, if not yet installed:

# apt-get install tk8.5
# update-alternatives --config wish

  Selection    Alternative
-----------------------------------------------
          1    /usr/bin/wish8.4
*+        2    /usr/bin/wish-default
          3    /usr/bin/wish8.5</pre>

There are 3 alternatives which provide wish.

Type in the number that corresponds to tk8.5 (in my case was 3) then hit enter.

Change fonts in ~/.gitk to DejaVu Sans Mono.

set mainfont {{DejaVu Sans Mono} 9}
set textfont {{DejaVu Sans Mono} 9}
set uifont {{DejaVu Sans Mono} 9 bold}