63 lines
1.5 KiB
Plaintext
63 lines
1.5 KiB
Plaintext
[core]
|
|
excludesfile = ~/.config/git/ignore
|
|
editor = $EDITOR
|
|
pager = $PAGER
|
|
fileMode = false
|
|
hooksPath = ~/.config/git/hooks
|
|
|
|
[init]
|
|
defaultBranch = master
|
|
|
|
[push]
|
|
default = current
|
|
|
|
[pull]
|
|
rebase = false
|
|
|
|
[color]
|
|
status = auto
|
|
diff = auto
|
|
branch = auto
|
|
interactive = auto
|
|
grep = auto
|
|
ui = auto
|
|
|
|
[advice]
|
|
addEmptyPathspec = false
|
|
|
|
[alias]
|
|
a = "!git ls-files -m | fzf | xargs git add"
|
|
d = diff
|
|
ds = diff --staged
|
|
dno = diff --name-only
|
|
co = checkout
|
|
ci = commit
|
|
ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)"
|
|
pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)"
|
|
st = status
|
|
br = branch
|
|
bm = branch --merged
|
|
bn = branch --no-merged
|
|
hist = log --pretty=format:\"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)\" --graph --date=relative --decorate --all --color=always
|
|
hs = "!git hist -n 10"
|
|
df = "!f() { git log --pretty=format:\"%h %cd [%cn] %s%d\" --date=relative | fzf | awk '{print $1}' | xargs -I {} git diff {}^ {}; }; f"
|
|
type = cat-file -t
|
|
dump = cat-file -p
|
|
unstage = "reset HEAD --"
|
|
last = log -1 HEAD
|
|
|
|
# edit conflicted file on merge
|
|
edit-unmerged = "!$EDITOR $(git ls-files --unmerged | cut -f2 | sort -u)"
|
|
|
|
# add conflicted file on merge
|
|
add-unmerged = "!git add $(git ls-files --unmerged | cut -f2 | sort -u)"
|
|
|
|
[github]
|
|
user = "TheK4n"
|
|
email = "djvlad967891@gmail.com"
|
|
|
|
[user]
|
|
name = "TheK4n"
|
|
email = "djvlad967891@gmail.com"
|
|
signingkey = "thek4n"
|