On 25/10/11 07:57 PM, jim norris wrote:

I do the following...


git add file1.c
git commit file1.c
git push review

git add file2.c
git commit file2.c
git push review

git add file3.c
git commit file3.c
git push review

I then realize I made a mistake in file1.c so...

-- make the change
git add file1.c
git commit --amend file1.c

However, the comment message I see when I do the commit is
from the commit of file3.c. Is this okay? Or did I do something
wrong? I've noticed there's a -C option that indicates to pick
up information from a previous commit. Is that what should be
used?


afaik you can only change the last commit with amend. You'd need to do a commit like normal for the last file1.c change, then rebase all the (4) commits interactively and merge the last and 1st ones....but then again this wouldn't be the first time somebody pointed out to me some easier way to do the same thing with git.
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development

Reply via email to