diff --git a/git/config b/git/config index 8aea47e..9427241 100644 --- a/git/config +++ b/git/config @@ -4,9 +4,32 @@ email = i@d0zingcat.dev name = d0zingcat signingkey = 39E301C2 -[url "ssh://git@github.com/"] - insteadOf = https://github.com/ +[url "https://"] + insteadOf = git:// [core] + editor = nvim excludesfile = /Users/d0zingcat/.config/git/.gitignore [commit] gpgsign = true +[pager] + difftool = true +[diff] + external = difft + tool = difftastic +[difftool] + prompt = false +[difftool "difftastic"] + cmd = difft "$LOCAL" "$REMOTE" +[alias] + lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit + pr = pull --rebase origin master + p = push + st = status + co = checkout + cb = checkout -b + br = branch + cm = commit -s -m + ca = commit --amend -s --no-edit + d = diff + ds = diff --staged + dc = diff --cached