From: Junio C Hamano <gitster@pobox.com>
To: Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no>
Cc: Jeff King <peff@peff.net>,
"Randal L. Schwartz" <merlyn@stonehenge.com>,
git@vger.kernel.org
Subject: Re: I want "fast forward my workdir to upstream if it's safe"
Date: Fri, 08 May 2009 08:57:02 -0700 [thread overview]
Message-ID: <7vk54rvb8x.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <F871F2A1-DFCF-4642-BB53-7BE483A93271@orakel.ntnu.no> (Eyvind Bernhardsen's message of "Fri\, 8 May 2009 14\:34\:12 +0200")
Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no> writes:
> I read it as a request for pull/merge --ff-only (based on "abort if
> the workdir is dirty or is not a fast-forward update"). This feature
> has been implemented twice, but never included:
Interesting. Do you mean twice they were both found lacking, substandard,
useless, uninteresting, buggy, incorrect, or all of the above? Or was it
just somebody simply forgot to apply a perfect patchset twice?
next prev parent reply other threads:[~2009-05-08 15:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-07 21:40 I want "fast forward my workdir to upstream if it's safe" Randal L. Schwartz
2009-05-07 23:18 ` Wincent Colaiuta
2009-05-07 23:20 ` Randal L. Schwartz
2009-05-08 2:30 ` Jeff King
2009-05-08 6:53 ` Andreas Ericsson
2009-05-08 7:01 ` Jeff King
2009-05-08 12:34 ` Eyvind Bernhardsen
2009-05-08 14:02 ` Randal L. Schwartz
2009-05-08 15:57 ` Junio C Hamano [this message]
2009-05-08 16:15 ` Jakub Narebski
2009-05-11 20:11 ` Eyvind Bernhardsen
2009-05-08 21:34 ` Miles Bader
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=7vk54rvb8x.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=eyvind-git@orakel.ntnu.no \
--cc=git@vger.kernel.org \
--cc=merlyn@stonehenge.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).