dotfiles/fish/.config/fish/functions/gm.fish

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

14 lines
297 B
Fish
Raw Normal View History

function gm
if not test -d .git
echo "Not a git repository"
return 0
end
if count $argv >/dev/null
git merge $argv
else
set -l remote (git symbolic-ref refs/remotes/origin/HEAD | awk -F'/' '{print $4}')
git merge origin/$remote
end
end