[Insight-developers] Gerrit review of Change Number 24

[Mathieu Malaterre]

On Thu, Aug 26, 2010 at 5:51 PM, Brad King <brad.king at kitware.com> wrote:
> On 08/26/2010 11:22 AM, Mathieu Malaterre wrote:
>> Hum... I must have done something wrong.
>>
>> $ git add CMake/ExportConfiguration/CMakeLists.txt CMakeLists.txt
>> $ git commit
>
> This should be
>
> $ git add CMake/ExportConfiguration/CMakeLists.txt CMakeLists.txt
> $ git commit --amend
>             ^^^^^^^
>
> to replace the existing commit with a fixed one.
>
>> $ git push gerrit d2ee19d:refs/changes/24
>
> This looks correct.
>
>> To malaterre at review.source.kitware.com:ITK
>>  ! [remote rejected] d2ee19d -> refs/changes/24 (squash commits first)
>
> This is telling you that instead of replacing the existing commit
> you added a new one.  You need to "squash commits first" like it
> says.  Use interactive rebase (git rebase -i HEAD~2) to do this.

Sorry I missed that. I had to replace the second instance of the word
'pick' with 'squash' in my editor (I simply exited the first time).

$ git push gerrit 448bcde:refs/changes/24
Counting objects: 62, done.
Delta compression using up to 16 threads.
Compressing objects: 100% (35/35), done.
Writing objects: 100% (38/38), 21.88 KiB, done.
Total 38 (delta 25), reused 0 (delta 0)
To malaterre at review.source.kitware.com:ITK
 * [new branch]      448bcde -> refs/changes/24

Thanks
-- 
Mathieu