Fix set-upstream alias

This commit is contained in:
ItsDrike 2021-12-04 02:40:44 +01:00
parent 0257190209
commit f1e9b37e24
No known key found for this signature in database
GPG key ID: FB8CA11A2CF3A843

View file

@ -48,7 +48,7 @@
lo = "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 --"
set-upstream = "!git branch --set-upstream-to=origin`git symbolic-ref --short HEAD`"
set-upstream = "!git branch --set-upstream-to=origin/`git symbolic-ref --short HEAD`"
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'"