From: Bagas Sanjaya <bagasdotme@gmail.com>
To: Git Users <git@vger.kernel.org>
Subject: [RFC doc] Tracking git.git
Date: Thu, 13 May 2021 20:05:43 +0700 [thread overview]
Message-ID: <4591b3bd-1f35-55cb-6eb0-be97810d6e68@gmail.com> (raw)
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 reply other threads:[~2021-05-13 13:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-13 13:05 Bagas Sanjaya [this message]
2021-05-13 14:49 ` [RFC doc] Tracking git.git dwh
2021-05-13 20:12 ` Junio C Hamano
2021-05-13 22:47 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4591b3bd-1f35-55cb-6eb0-be97810d6e68@gmail.com \
--to=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).