dotfiles/home/.config/git/config

78 lines
2.1 KiB
Plaintext
Raw Permalink Normal View History

2021-01-14 13:24:25 +00:00
[user]
2021-11-30 09:22:20 +00:00
name = ItsDrike
email = itsdrike@protonmail.com
signingkey = FB8CA11A2CF3A843
2021-01-14 13:24:25 +00:00
[alias]
2021-12-02 16:31:04 +00:00
quickclone = "clone --single-branch --depth=1"
bareclone = "!sh -c 'git clone --bare \"$0\" \"$1\"/.bare; echo \"gitdir: ./.bare\" > \"$1/.git\"'"
2021-12-02 16:31:04 +00:00
2021-12-01 18:58:56 +00:00
m = "merge"
p = "push"
pl = "pull"
f = "fetch"
s = "status --short --branch"
ss = "status"
ch = "checkout"
chb = "checkout -b"
undo = "reset --soft HEAD~"
redo = "reset HEAD@{1}"
unstage = "restore --staged"
c = "commit"
ca = "commit --ammend"
ci = "commit --interactive"
cm = "commit --message"
cv = "commit --verbose"
a = "add"
aa = "add --all"
ap = "add --patch"
au = "add --update"
d = "diff"
dc = "diff --cached"
ds = "diff --staged"
dw = "diff --word-diff"
b = "branch"
ba = "branch --all"
bd = "branch --delete"
bD = "branch --delete --force"
bm = "branch --move"
bM = "branch --move --force"
2021-11-30 09:22:20 +00:00
l = "log --oneline --decorate --all --graph"
2021-12-01 18:58:56 +00:00
lp = "log --patch"
lo = "log --pretty=oneline --abbrev-commit --graph"
2021-11-30 09:22:20 +00:00
lg = "log --all --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --"
2021-12-01 18:58:56 +00:00
2021-12-04 01:40:44 +00:00
set-upstream = "!git branch --set-upstream-to=origin/`git symbolic-ref --short HEAD`"
2021-12-01 18:58:56 +00:00
stash-staged = "!sh -c 'git stash --keep-index; git stash push -m \"staged\" --keep-index; git stash pop stash@{1}'"
2021-11-26 18:06:51 +00:00
find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'"
show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'"
2021-12-01 18:58:56 +00:00
[credential]
helper = store --file ~/.config/git/git-credentials
[core]
excludefile = ~/.config/git/global_gitignore
2021-12-03 17:58:42 +00:00
editor = nvim
2021-12-01 18:58:56 +00:00
pager = delta
[interactive]
diffFilter = delta --color-only
[delta]
line-numbers = true
2021-01-14 13:24:25 +00:00
[merge]
2021-12-01 18:58:56 +00:00
conflictstyle = diff3
2021-01-14 13:24:25 +00:00
[diff]
2021-12-01 18:58:56 +00:00
tool = vimdiff
[fetch]
prune = true
2021-01-14 13:24:25 +00:00
[commit]
2021-11-30 09:22:20 +00:00
gpgsign = true
2021-12-01 18:58:56 +00:00
[init]
defaultBranch = main