Tell user to fix problem instead of rebasing about np HOT 7 CLOSED

What's the point? git pull --rebase only works on a clean working directory.

from np.

The point would be to error out with Local/Remote history differs. Please push/pull changes. instead of automatically rebasing. I personally feel that rebasing it not always what I want to do.

This would give the user a chance to see what the remote changes was before going thru and publishing it to npm.

A problem that I see currently is that this script will publish anything commited to the remote at the time I run this command. I think it would be better to tell me that there has been new commits at the remote, and let med deal with what I want to do with that.

Let me know if I'm not making sense :)

from np.

Oh yeah. That does make sense. Thanks for elaborating. PR welcome ;)

from np.

@LinusU Interested in doing a PR? 🍰

from np.

Yes, but I'm a bit behind on my pr queue :)

I'm going to take a stab at the queue now so hopefully, you'll see some pull request for me, if not for this repo...

from np.

Instead of grep '^# Your branch', maybe use:

# check if behind
$ git rev-list --right-only --count HEAD...@'{u}'

# check if ahead
$ git rev-list --left-only --count HEAD...@'{u}'

from np.

I would tend to agree with @kevva.
My git status doesn't start with #, and instead just starts with Your branch.
So going off of his suggestion, you could probably do:

# history differs
test "00" -ne `git fetch; git rev-list --count --left-right "@{upstream}"...HEAD | awk '{ print $1$2 }'`

from np.