tortoisegit improved by leaps and bounds in the last 18 or so months. it's quite feature-complete. i suggest checking it out even if you've been bitten by it in the past.