[TYPO3-core] Refactor sys_notes

Philipp Gampe philipp.gampe at typo3.org
Tue Jun 12 13:30:35 CEST 2012


Hi Søren,

Søren Malling wrote:

> My rebasing skills s**** at the moment - how do I do a proper rebasing
> with out my "git commit --amend" contains the commit message from the
> latest commit in master?
> 
> Makes sense?

If you rebase, just commit as usual:

$ git fetch --all
$ git rebase origin/master
$ # resolve conflicts
$ git diff #check results
$ git add #just like normal
$ git commit #no --amend

You should than have your commit message already in place.

Cheers
-- 
Philipp Gampe – PGP-Key 0AD96065 – TYPO3 UG Bonn/Köln
Documentation – linkvalidator
TYPO3 .... inspiring people to share!



More information about the TYPO3-team-core mailing list