[Insight-developers] Gerrit Process Check

[Marcus D. Hanwell]

On Mon, Oct 18, 2010 at 2:51 PM, Bill Lorensen <bill.lorensen at gmail.com> wrote:
> Why:
> git checkout master
> git pullall
>
> and not just
> git pullall

Because you might not be on the master branch, if you are then the
checkout is not necessary.
>
> and why:
> git fetch
> git checkout -b my-topic origin/master
>
> and not just
> git pullall
> git checkout -b my-topic origin/master

This means that you do not have to checkout master, and the branch
will not be affected by any local commits you might have on your local
master. I was trying to minimize commands. Otherwise, expressing "if
you are on master, skip, otherwise, switch to the master branch and
then..."
>
> and instead of:
> git stage-push
> git stage-merge
>
> why not add an alias
> $ git stage-push-and-merge

That could be combined if desired. In other projects there is a next
branch, and you want to choose which branch to merge. It is certainly
possible to combine the two, I guess the question is whether it is
desirable.
>
> I'm trying to minimize the number of commands and the number of
> different commands.

Certainly. Hopefully I have cleared up why. Another approach in the
docs could be to say "All commands assume you are starting from the
master branch.

Marcus
>
> On Mon, Oct 18, 2010 at 2:29 PM, Marcus D. Hanwell
> <marcus.hanwell at kitware.com> wrote:
>> http://www.itk.org/Wiki/ITK/Git/Simple
>>
>> Please feel free to edit/ask if anything is not clear. If people find
>> this page useful I was going to add a link from the main Git page, but
>> today has been very busy and I have not had much time to look at this.
>>
>> Marcus
>>
>> On Mon, Oct 18, 2010 at 2:21 PM, Bill Lorensen <bill.lorensen at gmail.com> wrote:
>>> I hope others will try the aliases. For me, this is simple and
>>> fool-proof (assuming you don't screwup your topic some how).
>>>
>>> Is there a page that describes this simple process? It could point to
>>> more details if people want them.
>>>
>>> Bill
>>>
>>> On Mon, Oct 18, 2010 at 2:09 PM, Marcus D. Hanwell
>>> <marcus.hanwell at kitware.com> wrote:
>>>> On Mon, Oct 18, 2010 at 1:21 PM, Bill Lorensen <bill.lorensen at gmail.com> wrote:
>>>>> Marcus,
>>>>>
>>>>> I want to make sure I am using the new aliases properly.
>>>>>
>>>>> Here is what I do when I create a new topic:
>>>>>
>>>>> $ git checkout -b BillsTopic
>>>>>
>>>>>  edit, commit
>>>>>
>>>>> $ git gerrit-push
>>>>>
>>>>>  wait for my reviewers OK
>>>>>
>>>>> $ git stage-push
>>>>> $ git stage-merge
>>>>>
>>>> That is the process I would favor too. Does this work well for you? It
>>>> would be great to hear from people who have done this, and simple Git
>>>> page attempts to highlight this process, but perhaps it could do with
>>>> being improved a little?
>>>>
>>>> Marcus
>>>>
>>>
>>
>