git/list[1] front-page[2] threads[3] people[4] search[5] about
 

specifying "fast-forward" only in git-pull

From
DTDavid Tweed <david.tweed@gmail.com>
Date
Mar 28, 2007, 21:12 UTC
Message-ID
<e1dab3980703281412m78c2481bj9b9f7ec885dbbe4f@mail.gmail.com>

Hi, I'm looking through the documentation on git-pull and I see that I can specify a particular (sequence of) merge strategies, but I can't see a way to say "only do a fast forward, stopping if a fast forward doesn't apply". (Fast-forward doesn't appear to be a named strategy, which is why I can't use it with -s). Is there a way to do this?

Rationale: I have a repository on several machines that
are synchronised via usb-stick. 99.9% of the time a fast
forward is all that is needed, and for scripting the
synchronisation I'd like to restrict it so that only
fast-forwards can happen automatically and everything
else I have to do by invoking git myself. (Somehow I managed to get
a merge that gave a weird result without me actually
noticing for a couple of days, which combined with
my chronological version scripts seemed to put new
trees onto an unnamed branch. I've got the repo sorted
out now, but I want to avoid the same issue in future.)
Many thanks for any help.
-- 
cheers, dave tweed__________________________
david.tweed@gmail.com
Rm 124, School of Systems Engineering, University of Reading.
Details are all that matters; God dwells there, and you never get to
see Him if you don't struggle to get them right. -- Stephen Jay Gould
Next: Junio C Hamano
Message 1 of 3 in “specifying "fast-forward" only in git-pull”
  1. David TweedMar 28, 2007
  2. Junio C HamanoMar 28, 2007
  3. Shawn O. PearceMar 28, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.