[TYPO3-mvc] FYI: GitHelper

[Franz Koch]

Hey Bastian,

> Ok, that is my current workflow:
>
> The first thing I had to get used to was to always create a local branch
> for every new feature/fix/change I start to work on.
> Those local branches are really "cheap" in git and you can delete them
> anytime without flooding the log.
>
> Secondly I try to commit often - at least once before closing time.
> Mostly commits in one dev branch belong to one issue so they should end
> up in one changeset. To achieve that, you want to use "git commit
> --amend" which allows you to "change history" ;)
>
> Personally I only use stashing if I forgot to create a local branch.
>
> To test a pending changeset, I do the following:
> 1. update master ("git checkout master", "git pull")
> 2. create local branch from master ("git branch dev", "git checkout dev")
> 3. copy & paste the "cherry-pick" command from the changeset @
> review.typo3.org (e.g. "git fetch
> git://git.typo3.org/TYPO3v4/Extensions/extbase_kickstarter
> refs/changes/05/705/1 && git cherry-pick FETCH_HEAD")
> 4. test, post review and/or commit & push changes to create a new
> changeset (you'll have to use the --amend option in order to keep the
> previous commit message & the Change-Id so gerrit can detect the commit).

thanks for sharing. So working with branches is still a suitable way - 
good. Let's see how this --ammend stuff is working then :)

-- 
kind regards,
Franz Koch