RtkDev:A Git workflow
From RevTK
Draft page
Configure Git
Disable automatic conversion of line endings:
$ git config --global core.autocrlf false
Set your identity for commits:
$ git config --global user.name "John" $ git config --global user.email john.doe@gee-i-got-mail.com
Branches
master : this will correspond to the last public website release.
staging : this will be uploaded to test.koohii.com before it goes into master.
Workflow
Always create a new branch for new developments, for example:
$ git checkout -b new-feature
Merge (or rebase) in your develop branch, so that master always represent the live site version.
$ git checkout develop $ git merge new-feature
To create a patch with all the changes in your current branch you can use.
$ git format-patch master --stdout > new_feature.patch
