git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[RFC doc] Tracking git.git

From
Bagas Sanjaya <bagasdotme@gmail.com>
Date
May 13, 2021, 13:05 UTC
Message-ID
<4591b3bd-1f35-55cb-6eb0-be97810d6e68@gmail.com>
Hi,

Some people (most notably Git developers here and me) like to run Git compiled from git.git repository, as opposed to normal users that run either Git from distribution or compiled from official source tarball.

In git.git repo, besides master, there is also next, seen, and maint branches. The purposes of these branches are described on Documentation/howto/maintain-git.txt.

When we have git.git repo clone and track it, tracking master, next, and maint are easy peasy: git pull will do the job. But tracking seen is more like tracking linux-next. We do NOT use git pull because often doing so will try to merge origin (upstream) with our local version, which are divergent and most likely will end with conflict. Instead, we do git fetch first followed by resetting to upstream by git reset --hard origin/seen.

Should the fact above be documented? And on what file the fact should be placed? In INSTALL?

-- 
An old man doll... just what I always wanted! - Clara
Next: dwh@linuxprogrammer.org
Message 1 of 4 in “[RFC doc] Tracking git.git”
  1. Bagas SanjayaMay 13, 2021
  2. dwh@linuxprogrammer.orgMay 13, 2021
  3. Junio C HamanoMay 13, 2021
  4. Felipe ContrerasMay 13, 2021

Read the whole thread, see it on lore, or plain text.

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