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

On Tue, Nov 20, 2007 at 07:50:21AM +0100, Alex Riesen wrote:

quoted

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).

That is what I meant. In the current code, the errors aren't
consolidated at the end, and as you mentioned, we don't print the extra
message. Two patch series follows (but see comments on each patch).

-Peff