2021-01-23 18:51:23 +00:00
|
|
|
#!/bin/sh
|
2021-11-23 14:36:24 +00:00
|
|
|
git rev-parse @{upstream} >/dev/null 2>&1 ||
|
2021-11-25 12:13:01 +00:00
|
|
|
git branch --set-upstream-to=@{push}
|
|
|
|
|
git pull --rebase --autostash "$@" 2> >(head -3 >&2) ||
|
|
|
|
|
{ test -e $(git rev-parse --git-path rebase-merge) &&
|
|
|
|
|
printf "\e[31;1mError - aborting rebase!\e[0m\n" >&2 &&
|
|
|
|
|
git rebase --abort; }
|
