This is the worflow I usually share with people:

Updating a review after comments:
`git checkout master`
`git fetch apache`
`git rebase apache/master`
'git checkout <your-branch-name>`
`git rebase master`
<resolve any rebase issues>
`git rebase -i HEAD^^^^^` (number of `^` based on how far back you want to
pick
<switch `pick` with `edit` on the commit you want to modify>
<save the interactive edit file>
<now all your file states are as if the commit you chose to `edit` just got
applied>
<make any changes you want to the file>
`git add <all-files-changed>`
'git rebase --continue`
<now you have applied forward all your commits again, and are in a clean
state>
<now you can run post-reviews.sh>

where:
apache https://git-wip-us.apache.org/repos/asf/mesos.git


On Fri, Aug 7, 2015 at 10:09 AM, Khanduja, Vaibhav <[email protected]
> wrote:

> Hi
>
> I am updating a diff on review board on an existing. I understand, the
> existing commits should be adjusted before executing post_review.py. I am
> having few issues here with adjusting the commits, and wondering if
> somebody could guide me with commands which should be used to adjust the
> commit?
>
> Thanks
>

Reply via email to