ItsDrike/dotfiles
1
0
Fork 0
mirror of https://github.com/ItsDrike/dotfiles.git synced 2024-12-26 13:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add find and show merge commit aliases

Browse source
This commit is contained in:
ItsDrike 2021-11-26 19:06:51 +01:00
parent 365de49061
commit 65529ffd1d
No known key found for this signature in database
GPG key ID: FB8CA11A2CF3A843
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
home/.config/git/config
View file

@ -6,9 +6,12 @@
[credential] [credential]
helper = store --file ~/.config/git/git-credentials helper = store --file ~/.config/git/git-credentials
[alias] [alias]
l = log --oneline --decorate --all --graph l = "log --oneline --decorate --all --graph"
lol = log --pretty=oneline --abbrev-commit --graph lol = "log --pretty=oneline --abbrev-commit --graph"
lg = log --all --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit -- lg = "log --all --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --"
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'"
[merge] [merge]
tool = meld tool = meld
[mergetool] [mergetool]