Re: SCSI trees, merges and git status
- From
- James Bottomley <james.bottomley@steeleye.com>
- Date
- Apr 19, 2005, 00:16 UTC
- Message-ID
- <1113869817.4998.106.camel@mulgrave>
- In-Reply-To
- <1113869456.3579.12.camel@localhost.localdomain>
On Tue, 2005-04-19 at 10:10 +1000, David Woodhouse wrote:
Show 7 quoted lines
> On Mon, 2005-04-18 at 17:03 -0700, Linus Torvalds wrote: > > Git does work like BK in the way that you cannot remove history when you > > have distributed it. Once it's there, it's there. > > But older history can be pruned, and there's really no reason why an > http-based 'git pull' couldn't simply refrain from fetching commits > older than a certain threshold.
Yes, that's what I did to get back to the commit just before the merge:
fsck-cache --unreachable 54ff646c589dcc35182d01c5b557806759301aa3|awk '/^unreachable /{print $2}'|sed 's:^\(..\):.git/objects/\1/:'|xargs rm
removes all the objects from the tree prior to the bogus commit---it's based on your (Linus') git-prune-script.
James