I used my favorite command

rm -rf <repository> && git clone again

so it's fixed for now, but it would be cool to know how to fix that anyway

On Wed, Nov 20, 2013 at 2:55 PM, Petr Bena <benap...@gmail.com> wrote:
> aha I see now, I should have branch before patch1. I didn't. What am I
> supposed to do now?
>
> On Wed, Nov 20, 2013 at 2:19 PM, Nikolas Everett <never...@wikimedia.org> 
> wrote:
>> Normally:
>>
>> * clone a repo
>> * setup git & hooks
>>
>> # patch 1:
>>
>> * git checkout -b some_branch_name
>> * apply my changes
>> * git commit -a
>> * git review
>>
>> # patch 2:
>>
>> * git checkout production (or master on non-puppet repositories)
>> * git pull
>> * git checkout -b some_other_branch_name
>> * apply my changes
>> * git commit -a
>> * git review
>>
>>
>>
>> Nik
>>
>>
>>
>>
>> On Wed, Nov 20, 2013 at 8:13 AM, Petr Bena <benap...@gmail.com> wrote:
>>
>>> Currently I do:
>>>
>>> * clone a repo
>>> * setup git & hooks
>>>
>>> # patch 1:
>>>
>>> * apply my changes
>>> * commit
>>> * execute git-review
>>>
>>> # patch 2:
>>>
>>> * apply my changes
>>> * commit
>>>
>>> FAIL - the new commit it depending on previous commit - I can't push
>>>
>>> What am I supposed to do in order to push multiple separate patches?
>>>
>>> GIT-IDIOT way please, no long explanations, just commands and examples.
>>> Thanks
>>>
>>> _______________________________________________
>>> Wikitech-l mailing list
>>> Wikitech-l@lists.wikimedia.org
>>> https://lists.wikimedia.org/mailman/listinfo/wikitech-l
>> _______________________________________________
>> Wikitech-l mailing list
>> Wikitech-l@lists.wikimedia.org
>> https://lists.wikimedia.org/mailman/listinfo/wikitech-l

_______________________________________________
Wikitech-l mailing list
Wikitech-l@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikitech-l

Reply via email to