On Tue, Sep 04, 2007 at 05:55:16PM +0200, Andreas Ericsson <ae@xxxxxx> 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
