Hi Johannes! On Wed, Nov 26, 2008 at 5:35 PM, Johannes Sixt <j.sixt@xxxxxxxxxxxxx> wrote: > Ondrej Certik schrieb: >> I am also trying to make the example simpler. I tried to squash the >> first uninteresting ~1500 commits into one, but "git rebase -i" >> uterrly fails after squashing about 600 commits. Still investigating. > > Don't use rebase. Set a graft and rewrite the history: > > $ echo $(git rev-parse HEAD) $(git rev-parse HEAD~1500) >> \ > .git/info/grafts > > Assuming "first 1500" means the "most recent 1500" commits. But you get > the idea. You can truncate history as well by omitting the second SHA1. > It's very convenient to keep gitk open and File->Reload after each graft > that you set. > > When you're done with setting grafts: > > $ git filter-branch -f --tag-name-filter cat -- --all Indeed, this seems to be working robustly. Thanks! > > (You are doing this on a copy of your repository, don't you?) Yes. I spent the whole today trying to isolate the bug, but so far I haven't succeeded. Unfortunately, I need to work on other things now, so I am postponing this to some later time. The repository that reproduces it will stay online, so anyone feel free to produce a nice and simple (failing) test for the bug. Thanks, Ondrej -- 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
