[TYPO3-dev] GIT rebase question with submodules
Stefan Geith
typo3dev2010.nospam1 at geithware.de
Fri Sep 16 10:18:54 CEST 2011
Am 16.09.2011 09:27, schrieb Steffen Gebert:
> On 16.09.11 09:07, Stefan Geith wrote:
>> Hi GITies ;)
>>
>> I have two questions about best practice with GIT.
>
> You could start with "git submodule foreach 'git bla whatever'".
>
> This executes the command line for every single submodule.
So this would be the right order:
1. I start with this:
# cd typo3_src-4.5
# git pull && git submodule update
Or should I better do: ???
# git pull && git submodule update --init
# cd ../typo3_src-4.5.sg
# git rebase TYPO3_4-5
2. Then I get conflicts for some submodules;
Then I could do:
# git submodule foreach 'git reset && git add'
# git rebase --continue
3. Or should I do a
# git submodule foreach 'git reset'
_before_ I start 'git rebase TYPO3_4-5' ?
/Stefan
More information about the TYPO3-dev
mailing list