From: Mike Hommey <mh@glandium.org>
To: Andreas Ericsson <ae@op5.se>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Git's database structure
Date: Tue, 4 Sep 2007 18:07:26 +0200 [thread overview]
Message-ID: <20070904160726.GA17509@glandium.org> (raw)
In-Reply-To: <46DD7FE4.1060908@op5.se>
On Tue, Sep 04, 2007 at 05:55:16PM +0200, Andreas Ericsson <ae@op5.se> wrote:
> Each root tree can only ever belong to a single commit, unless you
> intentionally force git to make completely empty commits. git
> won't complain about this, so long as you don't make two in the
> same second, because it relies more heavily on the DAG than on
> developer sanity.
Actually, you don't need to be insane to have multiple commits pointing
at the same root tree. It is actually very easy:
- git clone
- do some stuff on your master branch and commit
- send your changes upstream
- upstream applies as is
- git pull
You now have everything merged, and the last commit on your master branch,
while being a different commit object due to its parenting, has the same
root tree as the tip of the remote branch.
Mike
next prev parent reply other threads:[~2007-09-04 16:08 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-04 15:23 Git's database structure Jon Smirl
2007-09-04 15:55 ` Andreas Ericsson
2007-09-04 16:07 ` Mike Hommey [this message]
2007-09-04 16:10 ` Andreas Ericsson
2007-09-04 16:19 ` Jon Smirl
2007-09-04 16:29 ` Andreas Ericsson
2007-09-04 17:09 ` Jeff King
2007-09-04 20:17 ` David Tweed
2007-09-04 17:21 ` Junio C Hamano
2007-09-04 16:28 ` Jon Smirl
2007-09-04 16:31 ` Andreas Ericsson
2007-09-04 16:47 ` Jon Smirl
2007-09-04 16:51 ` Andreas Ericsson
2007-09-04 17:25 ` Junio C Hamano
2007-09-04 17:44 ` Jon Smirl
2007-09-04 18:04 ` Mike Hommey
2007-09-04 19:44 ` Reece Dunn
2007-09-04 18:06 ` Junio C Hamano
2007-09-04 21:25 ` Theodore Tso
2007-09-04 21:54 ` Jon Smirl
2007-09-05 7:18 ` Andreas Ericsson
2007-09-05 13:41 ` Jon Smirl
2007-09-05 14:51 ` Andreas Ericsson
2007-09-05 15:37 ` Jon Smirl
2007-09-05 15:54 ` Julian Phillips
2007-09-05 16:12 ` Jon Smirl
2007-09-05 17:31 ` Julian Phillips
2007-09-06 1:27 ` Kyle Moffett
2007-09-05 17:39 ` Mike Hommey
2007-09-06 8:49 ` Andreas Ericsson
2007-09-06 9:09 ` Junio C Hamano
2007-09-06 11:03 ` Wincent Colaiuta
2007-09-06 12:56 ` Johannes Schindelin
2007-09-06 18:14 ` Steven Grimm
2007-09-07 0:33 ` Martin Langhoff
2007-09-05 19:52 ` Andy Parkins
2007-09-04 17:19 ` Julian Phillips
2007-09-04 17:30 ` Jon Smirl
2007-09-04 18:51 ` Andreas Ericsson
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070904160726.GA17509@glandium.org \
--to=mh@glandium.org \
--cc=ae@op5.se \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).