Re: ! [rejected] master -> master (non-fast forward)

Jeff King, Tue, Nov 20, 2007 05:16:20 +0100:

On Sun, Nov 18, 2007 at 07:29:01PM +0100, Alex Riesen wrote:

quoted

quoted

jonsmirl@terra:~/ds$ git push digispeaker
To ssh://jonsmirl1@git.digispeaker.com/~/projects/digispeaker-kernel.git
 ! [rejected]        master -> master (non-fast forward)
error: failed to push to

the branch you are pushing does not fast-forward to the one on
digispeaker. IOW, the master on digispeaker has changed since you made
changes on your local master.

Alex, are you going to rework your "consolidate nonff errors and print a
more extended message" patch on top of what's in next (I think it should
be much simpler now).

Do you mean that "Beautify the output of send-pack a bit", Message-ID:
[ref]?

If so, I'm confused. Didn't you already do that in your recent
"send-pack:" patch series? It looked to me as if you did (except for
the hint regarding non-ff branches to be updated everything is there).