From: "Michael S. Tsirkin" <mst@redhat.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: auto-merge after push?
Date: Mon, 11 May 2009 23:17:05 +0300 [thread overview]
Message-ID: <20090511201705.GA21045@redhat.com> (raw)
In-Reply-To: <alpine.DEB.1.00.0905111714250.4973@intel-tinevez-2-302>
On Mon, May 11, 2009 at 05:18:06PM +0200, Johannes Schindelin wrote:
> The thing is, a merge can fail. And then you already need direct access
> to the working directory in question.
>
> If you were actually talking about fast-forward pushes (because you did
> the merge locally already), this might help you:
>
> http://thread.gmane.org/gmane.comp.version-control.git/110251
>
> Ciao,
> Dscho
Sounds good. But it looks like this patch is unlikely to be merged,
does it not?
--
MST
next prev parent reply other threads:[~2009-05-11 20:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-11 14:23 auto-merge after push? Michael S. Tsirkin
2009-05-11 14:35 ` Jakub Narebski
2009-05-11 15:18 ` Johannes Schindelin
2009-05-11 20:17 ` Michael S. Tsirkin [this message]
2009-05-11 21:03 ` Johannes Schindelin
2009-05-11 21:13 ` Michael S. Tsirkin
2009-05-11 23:29 ` Johannes Schindelin
[not found] ` <20090511211215.GC21045@redhat.com>
2009-05-11 23:28 ` Johannes Schindelin
2009-05-19 9:36 ` Michael S. Tsirkin
2009-06-11 10:40 ` Michael S. Tsirkin
2009-07-11 20:38 ` Michael S. Tsirkin
2009-07-12 2:42 ` Johannes Schindelin
2009-07-12 21:30 ` Junio C Hamano
2009-07-12 22:31 ` Johannes Schindelin
2009-07-15 14:54 ` Michael S. Tsirkin
2009-07-15 19:31 ` Junio C Hamano
2009-07-15 19:57 ` Michael S. Tsirkin
2009-07-16 8:01 ` Johannes Schindelin
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=20090511201705.GA21045@redhat.com \
--to=mst@redhat.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/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).