Thread (1 message) 1 message, 1 author, 2016-06-15

Re: I want "fast forward my workdir to upstream if it's safe"

From: Miles Bader <hidden>
Date: 2016-06-15 22:46:44

Eyvind Bernhardsen [off-list ref] 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]
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help