Re: Cleaning up git user-interface warts

From: Jerome Lovy <t2a2e9z8ncbs9qg@brefemail.com>
Date: Nov 21, 2006, 13:25 UTC
Message-ID: <ejuv2a$atg$1@sea.gmane.org>
In-Reply-To: <87velgs9hx.wl%cworth@cworth.org>

On Wed, 15 Nov 2006, Carl Worth wrote:

Show 13 quoted lines

> Well, one of the problems is that with current git I can teach, (and I
> have), that there's a conceptual:
> 
> 	pull = fetch + merge
> 
> But then shortly after I have to teach an interface notion:
> 
> 	merge = pull .
> 
> So there's this goofy circular notion that people end up with
> mentally. If we fix it so that a local merge really is performed with
> "git merge <branch>" instead of "git pull . <branch>" then teaching
> pull=fetch+merge really is a lot easier.

On a conceptual level, can we not perhaps explain that if

	pull = fetch + merge

then

	merge = pull - fetch

and that the latter (pull - fetch) happens to be expressed with the interface as 'git pull .' ?

My 2 cents. Jérôme

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