From f1e9b37e24c242949a630063966bc8c11ca9a938 Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Sat, 4 Dec 2021 02:40:44 +0100 Subject: [PATCH] Fix set-upstream alias --- home/.config/git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/git/config b/home/.config/git/config index a22f815..80ba740 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -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'"