rebase and unmerged files

rebase and unmerged files

[bill lam]

I tried to cleanup commit mistake and use rebase -i. It stopped and
sha1 and generated a list of unmerge files.  My intention was to use
the version in sha1 but with some editing.  Since all those unmerge
files contained unresolved conflict delineated by

<<<<<<
HEAD
=======
sha1
>>>>>>>

I have to manually type commands such as
git checkout sha1 -- file1
to get the version I wanted for further editing.  Is there any easier
method that can automating checkout all those sha1 version of the
unmerged files.

Also, for git-commit during rebase, should I use 
git commit --amend
or just
git commit

-- 
regards,
====================================================
GPG key 1024D/4434BAB3 2008-08-24
gpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3
唐詩170 崔顥  黃鶴樓
    昔人已乘黃鶴去  此地空餘黃鶴樓  黃鶴一去不復返  白雲千載空悠悠
    晴川歷歷漢陽樹  芳草萋萋鸚鵡洲  日暮鄉關何處是  煙波江上使人愁