thek4n/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ref gitconfig

Browse Source
This commit is contained in:
TheK4n 2023-03-08 17:06:39 +03:00
parent a6ed06b81f
commit a7c6e3b828
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
home/user/.gitconfig
View File

@ -35,22 +35,22 @@
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
df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}"
hs = "!git hist | head"
df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}"
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 --'
unstage = "reset HEAD --"
last = log -1 HEAD
branches = branch -avv --list
# edit conflicted file on merge
edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; $EDITOR `f`"
edit-unmerged = "!$EDITOR $(git ls-files --unmerged | cut -f2 | sort -u)"
# add conflicted file on merge
add-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
add-unmerged = "!git add $(git ls-files --unmerged | cut -f2 | sort -u)"
[github]
user = "TheK4n"