Re: [PATCH 0/3] Reject non-ff pulls by default

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Sep 9, 2013, 20:50 UTC
Message-ID: <vpq38pdlnxk.fsf@anie.imag.fr>
In-Reply-To: <20130909202435.GJ2582@serenity.lan>

John Keeping <john@keeping.me.uk> writes:

Show 11 quoted lines

> I think we need to make sure that we give instructions for how to go
> back if the default hasn't done what you wanted.  Something like this:
>
>     Your pull did not fast-forward, so Git has merged '$upstream' into
>     your branch, which may not be correct for your project.  If you
>     would rather rebase your changes, run
>
>         git rebase
>
>     See "pull.mode" in git-config(1) to suppress this message in the
>     future.

Sounds good to me. One option is to display the warning on the command-line, and another option is to show it in COMMIT_EDITMSG (since we now default to showing it even for non-conflicted merges).

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

$ 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.