From: Miles Bader <miles@gnu.org>
To: Eyvind Bernhardsen <eyvind-git@orakel.ntnu.no>
Cc: Jeff King <peff@peff.net>,
"Randal L. Schwartz" <merlyn@stonehenge.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: I want "fast forward my workdir to upstream if it's safe"
Date: Sat, 09 May 2009 06:34:55 +0900 [thread overview]
Message-ID: <87iqkbth1c.fsf@catnip.gol.com> (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:
I'd also like such a feature.
[It seems like such an obvious partner to "--no-ff" (etc), that it's
kind of surprising it isn't there already -- I think there have been
multiple times in the past where I've spent time grovelling the
pull/merge documentation looking for the right option name to do this,
only to give up in confusion when I couldn't find it...]
-Miles
--
Love is the difficult realization that something other than oneself is real.
[Iris Murdoch]
prev parent reply other threads:[~2009-05-08 21:35 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
2009-05-08 16:15 ` Jakub Narebski
2009-05-11 20:11 ` Eyvind Bernhardsen
2009-05-08 21:34 ` Miles Bader [this message]
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=87iqkbth1c.fsf@catnip.gol.com \
--to=miles@gnu.org \
--cc=eyvind-git@orakel.ntnu.no \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.