Does file3 rely on file2, which relies on file1, or are they all
independent? If they're a sequence, then
git checkout -b temp HEAD~2
<edit file1.c>
git add file1.c
git commit --amend
git checkout <original branch>
git rebase temp
git push review
You don't need to do individual pushes for each commit, as the
sequence of commits leading up to the head of the branch off of trunk
will create a sequence of patches in Gerrit.
> -----Original Message-----
> From: [email protected] [mailto:openocd-
> [email protected]] On Behalf Of jim norris
> Sent: Tuesday, October 25, 2011 6:58 PM
> To: [email protected]
> Subject: [Openocd-development] git question.....
>
>
> 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?
>
>
> _______________________________________________
> Openocd-development mailing list
> [email protected]
> https://lists.berlios.de/mailman/listinfo/openocd-development
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development
