Git on Ricky

How Core Git Developers Configure Git

Fri, 07 Mar 2025 15:46:00 +0800

How Core Git Developers Configure Git

# clearly makes git better

[column]
 ui = auto
[branch]
 sort = -committerdate
[tag]
 sort = version:refname
[init]
 defaultBranch = main
[diff]
 algorithm = histogram
 colorMoved = plain
 mnemonicPrefix = true
 renames = true
[push]
 default = simple
 autoSetupRemote = true
 followTags = true
[fetch]
 prune = true
 pruneTags = true
 all = true

# why the hell not?

[help]
 autocorrect = prompt
[commit]
 verbose = true
[rerere]
 enabled = true
 autoupdate = true
[core]
 excludesfile = ~/.gitignore
[rebase]
 autoSquash = true
 autoStash = true
 updateRefs = true

# a matter of taste (uncomment if you dare)

[core]
 # fsmonitor = true
 # untrackedCache = true
[merge]
 # (just 'diff3' if git version < 2.3)
 # conflictstyle = zdiff3
[pull]
 # rebase = true

How I configure my Git identities

Mon, 25 Nov 2024 17:35:35 +0800

How I configure my Git identities

includeIf

[includeIf "gitdir:~/code/**"]
path = ~/.config/git/personal
[includeIf "gitdir:~/work/**"]
path = ~/.config/git/work

hasconfig:remote.*.url:

[includeIf "hasconfig:remote.*.url:git@github.com:*/**"]
path = ~/.config/git/config-gh
[includeIf "hasconfig:remote.*.url:git@github.com:orgname/**"]
path = ~/.config/git/config-gh-org
[includeIf "hasconfig:remote.*.url:git@gitlab.com:*/**"]
path = ~/.config/git/config-gl
[includeIf "hasconfig:remote.*.url:git@git.sr.ht:*/**"]
path = ~/.config/git/config-srht

insteadOf

[url "gh-work:orgname"]
insteadOf = git@github.com:orgname

Git force push

Fri, 26 Jul 2024 12:24:00 +0800

git push --force-with-lease

Tracking SQLite Database Changes in Git

Wed, 07 Feb 2024 19:20:15 +0800

First, add a diff type called “sqlite3” to your config. The simplest way is to just run these commands:

git config diff.sqlite3.binary true git config diff.sqlite3.textconv "echo .dump | sqlite3"

Alternatively, you can add this snippet to your ~/.gitconfig or .git/config in your repository:

[diff "sqlite3"] binary = true textconv = "echo .dump | sqlite3"

Next, create a file called .gitattributes if it’s not already present and add this line:

Sign git commits with GPG

Tue, 05 Oct 2021 18:28:06 +0800

Sign git commits with GPG

Little Git Tricks: Use .mailmap to Merge Different Authors

Thu, 05 Aug 2021 13:42:14 +0800

Little Git Tricks: Use .mailmap to Merge Different Authors

.mailmap file ==> Name you want to keep <email> Name you no longer want <email>

John Doe John Doe
John Doe John Doe
John Doe john doe
Max Example Max

before

$ git shortlog -se
 1 John Doe <John@Doe.org>
 1 John Doe <John@doe.org>
 2 John Doe <john@doe.org>
 1 Max <max@test.co.uk>
 3 Max Example <hi@test.com>
 1 john doe <john@doe.org>

after

$ git shortlog -se
 5 John Doe <john@doe.org>
 4 Max Example <hi@test.com>

Introduction to Git internals

Tue, 02 Jun 2020 08:39:08 +0800

Introduction to Git internals

CS Visualized: Useful Git Commands

Thu, 16 Apr 2020 20:20:16 +0800

CS Visualized: Useful Git Commands