Git on rikosjett

Use .gitignore_global

Sun, 19 Apr 2026 00:00:00 +0200

I hate .DS_Store. The files that constantly sneak their way into git history. Not anymore!

SHELL

git config --global core.excludesfile '~/.gitignore_global'
echo '.DS_Store' >> ~/.gitignore_global

Untracking stuff in git

Sun, 18 Aug 2024 00:00:00 +0200

Accidental tracking and commits to git happens. Here's how to remove the stuff again.

Remember to add the stuff to .gitignore

BASH

$ git rm -r --cached <file-or-directory-name>
$ git commit -m "Yes I did not mean to include these..."
$ git push origin main

Change git init default branch to main

Wed, 03 Aug 2022 00:00:00 +0200

SHELL

$ git config --global init.defaultBranch main

Rename git master branch to main

Thu, 01 Apr 2021 00:00:00 +0200

How to rename old repository master branch to main.

Rename local branch

SHELL

$ git branch -m master main

Push new `main` branch to origin

SHELL

$ git push -u origin main

Delete old master branch

If old master isn't the defaultbranch on the remote

SHELL

$ git push origin --delete master

If you get an error, this step needs to be done manually on the remote, as main needs to be set as defaultbefore deleting the old master.

Install GitHub CLI

Sun, 28 Mar 2021 00:00:00 +0100

Manual Install

Get Version

SHELL

VERSION="curl "https://api.github.com/repos/cli/cli/releases/latest" | grep '"tag_name"' | sed -E 's/.*"([^"]+)".*/\1/' | cut -c2-"

Download latest version

With wget

SHELL

$ wget https://github.com/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_linux_amd64.tar.gz

With curl

SHELL

$ curl -sSL https://github.com/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_linux_amd64.tar.gz -o gh_${VERSION}_linux_amd64.tar.gz

Extract downloaded file

SHELL

$ tar xvf gh_${VERSION}_linux_amd64.tar.gz

Copy to /usr/local/bin

SHELL

$ sudo cp gh_${VERSION}_linux_amd64/bin/gh /usr/local/bin/

Enable 2FA and access github repo

Fri, 26 Mar 2021 00:00:00 +0100

When 2FA is enabled, one must create a personal access token, and use that as password. Remote repo must be on HTTPS, not SSH. Using two-factor authentication with the command line

Extract git commit messages since

Fri, 26 Mar 2021 00:00:00 +0100

To quickly get list of events. Usefull for release notes etc.

git log --format=%B <commit hash>..HEAD > filename.ext

Fix commit author with git amend

Fri, 26 Mar 2021 00:00:00 +0100

git commit --amend --author="Author Name <email@address.com>"

Rewrite commit author in Git repo

Fri, 26 Mar 2021 00:00:00 +0100

SHELL

#!/bin/sh

git filter-branch --env-filter '

OLD_EMAIL="Wrong user e-mail"
CORRECT_NAME="User name"
CORRECT_EMAIL="User e-mail"

if [ "$GIT_COMMITTER_EMAIL" = "$OLD_EMAIL" ]
then
 export GIT_COMMITTER_NAME="$CORRECT_NAME"
 export GIT_COMMITTER_EMAIL="$CORRECT_EMAIL"
fi
if [ "$GIT_AUTHOR_EMAIL" = "$OLD_EMAIL" ]
then
 export GIT_AUTHOR_NAME="$CORRECT_NAME"
 export GIT_AUTHOR_EMAIL="$CORRECT_EMAIL"
fi
' --tag-name-filter cat -- --branches --tags

Git on rikosjett

Use .gitignore_global

Untracking stuff in git

Change git init default branch to main

Rename git master branch to main

Rename local branch

Push new main branch to origin

Delete old master branch

Install GitHub CLI

Manual Install

Get Version

Download latest version

With wget

With curl

Extract downloaded file

Copy to /usr/local/bin

Enable 2FA and access github repo

Extract git commit messages since

Fix commit author with git amend

Rewrite commit author in Git repo

Push new `main` branch to origin