Re: Cleaning up git user-interface warts

From: Alexandre Julliard <julliard@winehq.org>
Date: Nov 17, 2006, 16:49 UTC
Message-ID: <87y7qahvbp.fsf@wine.dyndns.org>
In-Reply-To: <ejkdhv$vog$2@sea.gmane.org>

Jakub Narebski <jnareb@gmail.com> writes:

Show 13 quoted lines

> Alexandre Julliard wrote:
>
>> Junio C Hamano <junkio@cox.net> writes:
>> 
>>> I would rather say "use 'git branch' to make sure if you are
>>> ready to merge".  Who teaches not to use "git pull"?
>> 
>> We do that for Wine. The problem is that we recommend using git-rebase
>> to make it easier for occasional developers to keep a clean history,
>> and rebase and pull interfere badly.
>
> What about proposed (and I think not accepted) merge strategy
> "rebase" (formerly called "subordinate" or something like that)?

That sounds very interesting. Has it ever been implemented, or only discussed?

-- 
Alexandre Julliard

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