From: Alex Riesen <raa.lkml@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Jon Smirl <jonsmirl@gmail.com>, Git Mailing List <git@vger.kernel.org>
Subject: Re: ! [rejected] master -> master (non-fast forward)
Date: Tue, 20 Nov 2007 07:50:21 +0100 [thread overview]
Message-ID: <20071120065021.GA4172@steel.home> (raw)
In-Reply-To: <20071120041620.GA23566@sigill.intra.peff.net>
Jeff King, Tue, Nov 20, 2007 05:16:20 +0100:
> On Sun, Nov 18, 2007 at 07:29:01PM +0100, Alex Riesen wrote:
>
> > > 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:
<20071112221140.GD2918@steel.home>?
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).
next prev parent reply other threads:[~2007-11-20 6:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-18 15:12 ! [rejected] master -> master (non-fast forward) Jon Smirl
2007-11-18 18:10 ` Junio C Hamano
2007-11-18 18:42 ` Jon Smirl
2007-11-19 17:47 ` Catalin Marinas
2007-11-19 22:54 ` Jon Smirl
2007-11-20 0:03 ` Daniel Barkalow
2007-11-18 18:29 ` Alex Riesen
2007-11-20 4:16 ` Jeff King
2007-11-20 6:50 ` Alex Riesen [this message]
2007-11-20 11:13 ` Jeff King
2007-11-20 11:18 ` [PATCH 1/2] send-pack: cluster ref status reporting Jeff King
2007-11-20 18:22 ` Alex Riesen
2007-11-21 7:24 ` Junio C Hamano
2007-11-21 7:33 ` Jeff King
2007-11-21 7:36 ` Junio C Hamano
2007-11-21 7:39 ` Jeff King
2007-11-21 7:37 ` Jeff King
2007-11-20 11:21 ` [PATCH 2/2] send-pack: print "maybe you need to pull" hint Jeff King
2007-11-20 18:24 ` Alex Riesen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071120065021.GA4172@steel.home \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonsmirl@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).