58 lines
1.6 KiB
Plaintext
58 lines
1.6 KiB
Plaintext
[core]
|
|
excludesfile = ~/.gitignore
|
|
editor = nvim
|
|
fileMode = false
|
|
|
|
[init]
|
|
defaultBranch = master
|
|
|
|
[push]
|
|
default = current
|
|
|
|
[color]
|
|
status = auto
|
|
diff = auto
|
|
branch = auto
|
|
interactive = auto
|
|
grep = auto
|
|
ui = auto
|
|
|
|
[alias]
|
|
a = "!git status --short | peco | awk '{print $2}' | xargs git add"
|
|
d = diff
|
|
co = checkout
|
|
ci = commit
|
|
ca = commit -a
|
|
ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)"
|
|
pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)"
|
|
st = status
|
|
br = branch
|
|
ba = branch -a
|
|
bm = branch --merged
|
|
bn = branch --no-merged
|
|
df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}"
|
|
hist = log --pretty=format:\"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)\" --graph --date=relative --decorate --all
|
|
llog = log --graph --name-status --pretty=format:\"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset\" --date=relative
|
|
open = "!hub browse"
|
|
type = cat-file -t
|
|
dump = cat-file -p
|
|
find = "!f() { git log --pretty=format:\"%h %cd [%cn] %s%d\" --date=relative -S'pretty' -S\"$@\" | peco | awk '{print $1}' | xargs -I {} git diff {}^ {}; }; f"
|
|
unstage = 'reset HEAD --'
|
|
last = log -1 HEAD
|
|
|
|
|
|
|
|
# edit conflicted file on merge
|
|
edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim `f`"
|
|
|
|
# add conflicted file on merge
|
|
add-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
|
|
|
|
[github]
|
|
user = "TheK4n"
|
|
email = "djvlad967891@gmail.com"
|
|
|
|
[user]
|
|
email = djvlad967891@gmail.com
|
|
name = TheK4n
|