Always rebase pulls, use --no-rebase to not. Fix name, add github pull requests to fetch