From: Andreas Ericsson <ae@op5.se>
To: Marco Roeland <marco.roeland@xs4all.nl>
Cc: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Subject: Re: dangling commits
Date: Mon, 16 Jan 2006 13:05:16 +0100 [thread overview]
Message-ID: <43CB8BFC.8050900@op5.se> (raw)
In-Reply-To: <20060116113332.GA5356@fiberbit.xs4all.nl>
Marco Roeland wrote:
> On Monday January 16th 2006 Andreas Ericsson wrote:
>
>
>>Since "pu" = "proposed updates" it only makes sense to keep it on top of
>>the current master, otherwise the effort required for anyone to test it
>>in conjunction with the latest master branch would simply be too great.
>
>
> But couldn't (in theory) the new "rebased" versions of blobs in the "pu"
> branch be first committed as the old not yet rebased version and then
> as the new version.
The blobs are immutable and never change for a rebase, unless the
file(s) it applies to is changed in master as well. It's the commits
that do because they get new parents.
Remember that the blob object is just the (deltified?) file that's the
result of the commit operation. The commit object is an object in its
own rights, holding author info and commit-time and such. Do
$ git cat-file commit HEAD
and you'll see what a commit-object looks like.
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
next prev parent reply other threads:[~2006-01-16 12:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-15 21:05 dangling commits Nick Williams
2006-01-15 20:56 ` Andreas Ericsson
2006-01-15 21:37 ` Nick Williams
2006-01-15 21:15 ` Junio C Hamano
2006-01-15 22:11 ` Wolfgang Denk
2006-01-15 22:55 ` Junio C Hamano
2006-01-16 8:52 ` Marco Roeland
2006-01-16 9:27 ` Junio C Hamano
2006-01-16 10:17 ` Marco Roeland
2006-01-16 10:28 ` Andreas Ericsson
2006-01-16 11:33 ` Marco Roeland
2006-01-16 12:05 ` Andreas Ericsson [this message]
2006-01-16 12:40 ` Marco Roeland
2006-01-16 9:32 ` Wolfgang Denk
2006-01-16 10:08 ` Marco Roeland
-- strict thread matches above, loose matches on Subject: below --
2006-05-20 23:05 Dave Jones
2006-05-20 23:08 ` Sean
2006-05-20 23:08 ` Sean
2006-05-20 23:19 ` Linus Torvalds
2006-05-20 23:49 ` Dave Jones
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=43CB8BFC.8050900@op5.se \
--to=ae@op5.se \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=marco.roeland@xs4all.nl \
/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.