All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: jnareb@gmail.com
Cc: git@vger.kernel.org
Subject: Re: Items not covered by repository-layout.txt
Date: Mon, 10 Jul 2006 17:23:21 -0700	[thread overview]
Message-ID: <7vlkr16lc6.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <e8uhjg$5o1$1@sea.gmane.org> (Jakub Narebski's message of "Mon, 10 Jul 2006 23:42:42 +0200")

Jakub Narebski <jnareb@gmail.com> writes:

> Could you then tell me what is the format of FETCH_HEAD and what other *_HEADs 
> can be seen in $GIT_DIR (MERGE_HEAD?)?

Which essentially is that you are telling me to do that, but I
am a bit busy this week.

If you can use the source to figure them out, that would be
great; otherwise this can wait or others can chime in.

For FETCH_HEAD fmt-merge-msg and git-pull would be helpful.
The general format is, one entry per line:

	object name <TAB> merge-marker <TAB> notes

where merge-marker is either empty (for commits to be merged by
git-pull that called git-fetch) or not-for-merge, and notes is a
human readable comment that describes where that object came
from.  Note that this is read both by humans _AND_ machine;
fmt-merge-msg relies on how it is stated.

Others "git grep -e _HEAD -- '*.sh'" perhaps.

	ORIG_HEAD - used to keep the value of HEAD before we do
                    anything we might regret

	MERGE_HEAD - one or more commit object names that are
                    being merged into the current branch during
                    a merge.

	MERGE_MSG - generated message for an automerge.

      reply	other threads:[~2006-07-11  0:23 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-07-10 20:46 Items not covered by repository-layout.txt Jakub Narebski
2006-07-10 21:29 ` Junio C Hamano
2006-07-10 21:42   ` Jakub Narebski
2006-07-11  0:23     ` Junio C Hamano [this message]

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=7vlkr16lc6.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=git@vger.kernel.org \
    --cc=jnareb@gmail.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.