Re: Cleaning up git user-interface warts

From: Linus Torvalds <torvalds@osdl.org>
Date: Nov 15, 2006, 21:31 UTC
Message-ID: <Pine.LNX.4.64.0611151329420.3349@woody.osdl.org>
In-Reply-To: <200611152212.35978.Josef.Weidendorfer@gmx.de>

On Wed, 15 Nov 2006, Josef Weidendorfer wrote:

> 
> I am not really opposed to pull doing a merge. It only should work in
> a useful way: ie. only do the merge of updated origin branch when
> current branch is master (given "Pull: master:origin").

I absolutely agree.

We should _only_ use the default head when pulling from the default head ("master"). If we don't pull from within the default branch, we should either require an explicit head _or_ we should require that an explicit mapping has been set up in .git/config or in .git/remotes/..

So doing a "git pull" from any other branch than "master" should probably by default say "which branch do you want to pull from today"?

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