On Fri, Mar 24, 2006 at 03:01:35AM -0800, Junio C Hamano wrote: > > git-read-tree --reset "$base" > Exactly. That's what I meant. Thanks. Hmm. That doesn't actually work, though. If I have a history like this: $ cg-init -m "initial" $ cg-tag initial $ echo contents >file $ cg-add file $ cg-commit -m "added file" and I try this: $ echo changes >file $ git-read-tree --reset master $ git-read-tree -m -u master initial I get this: fatal: Entry 'file' not uptodate. Cannot merge. If I do an update-index before the second read-tree, then I simply get: fatal: Entry 'file' would be overwritten by merge. Cannot merge. Is there something I'm missing, or is a 'git reset --hard' really what we want here (in that case, the fact that git reset changes the HEAD might be a problem)? -Peff - : 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