You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
17 lines
398 B
Fish
17 lines
398 B
Fish
function omf.update
|
|
set -l repo "upstream"
|
|
test -z (git config --get remote.upstream.url)
|
|
and set -l repo "origin"
|
|
|
|
if git diff-index --quiet HEAD -- >/dev/null ^&1
|
|
git pull $repo master >/dev/null ^&1
|
|
else
|
|
git stash >/dev/null ^&1
|
|
if git pull --rebase $repo master >/dev/null ^&1
|
|
git stash apply >/dev/null ^&1
|
|
else
|
|
omf.util_sync "origin"
|
|
end
|
|
end
|
|
end
|