If you're doing this locally the -rescan option should be fine. I was doing it to a VPS and my connection dropped midway through and I had to start all the way from the beginning. Then the connection dropped again
My advice is if you're doing it on a VPS also specify -daemon to avoid that problem with bitcoind!