Merge branch 'master' of https://github.com/js0ny/dotfiles

common/gitconfig.example

@@ -10,6 +10,21 @@
 [user] # Modify the name and email
 	name = whoami
 	email = whoami@example.com
+[alias]
+	cl = clone
+	clnh = clone --depth 1
+	cma = commit -am
+	logs = log --oneline --graph --decorate --all
+	last = log -1 HEAD
+	undo = reset --hard HEAD
+[core]
+	editor = nvim
+	pager = delta
+	autocrlf = input
+	safecrlf = true
+	excludesfile = $XDG_CONFIG_HOME/git/ignore
+	quotePath = false # zh-CN: 解决中文路径问题
+	eol = lf
 [include]
     path = ~/.config/git/catppuccin-delta.gitconfig
 [core]
@@ -22,13 +37,31 @@
 	navigate = true
 	dark = true
     features = catppuccin-mocha
+[diff]
+    tool = nvimdiff
+[difftool]
+    prompt = false
+[difftool "nvimdiff"]
+    cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
+[merge]
+    tool = nvimdiff
+[mergetool]
+    prompt = false
+[mergetool "nvimdiff"]
+    cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\""
+[color]
+	ui = auto
+[pull]
+	ff = only
+[init]
+	defaultBranch = master
 [filter "lfs"]
 	clean = git-lfs clean -- %f
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
-[init]
-    defaultBranch = master
-
-# [url "git@github.com:"] # Force ssh
+# Force ssh
+# [url "git@github.com:"]
 # 	insteadOf = https://github.com/
+[url "git@codeberg.org:"]
+	insteadOf = https://codeberg.org/