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

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sep 8, 2013, 08:49 UTC
Message-ID: <CAMP44s1ZjtVdj1wys_7VkBrmvGAkh9cfOpZ_22aVONMH3GdcRg@mail.gmail.com>
In-Reply-To: <01BEC88E9B724BA4986F2678A4D9F4E6@PhilipOakley>

On Sun, Sep 8, 2013 at 3:42 AM, Philip Oakley <philipoakley@iee.org> wrote:

> The 'problem' is (would be) that I don't yet know that I would need the
> --onto pu until I discover (how?) that the default rebase would result in
> conflicts.

I don't see what that has to do with an invocation of 'git rebase' without arguments, and @{tail}. There's absolutely no way Git can figure out for you which is the appropriate place for you to rebase onto.

However, it shouldn't be too difficult to write a tool that checks multiple commits and tells you on top of which ones a rebase could work, but I don't think 'git rebase' is the right place.

-- 
Felipe Contreras

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