From 65529ffd1d2b6dcdd3b29513a4689e3f5b77e4c4 Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Fri, 26 Nov 2021 19:06:51 +0100 Subject: [PATCH] Add find and show merge commit aliases --- home/.config/git/config | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/home/.config/git/config b/home/.config/git/config index 9476b66..2400e83 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -6,9 +6,12 @@ [credential] helper = store --file ~/.config/git/git-credentials [alias] - l = log --oneline --decorate --all --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 -- + l = "log --oneline --decorate --all --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 --" + 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] tool = meld [mergetool]