Overview
We use the common git workflow, which means we have two major branches:
...
see: https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
Bugfix vs Hotfix
Bugfix: not so important, will be merged to next released in normal schedule cycle of the software into dev (and then from dev to master)
Hotfix: important bug, branch from master - merge into master & dev, will be released soon / faster. Important security fixes, ...
Howto add a new branch
| Anchor | ||||
|---|---|---|---|---|
|
- Add branch in Atlassian Stash via "Create Branch"
- from Dev
- Append your own prename at the end of the branches name!
- on local machine do:
| Code Block | ||
|---|---|---|
| ||
# git pull all branches git pull # git add local branch auto following/tracking remote branch git checkout --track origin/feature/config # git push auto to remote branch -> # see Git config global push.default = simple git push |
Useful GIT stuff
Push style
| Code Block | ||
|---|---|---|
| ||
# push all branch names on local git to same names on remote git git config --global push.default simple |
Enable server certificate on client
Trying to clone/fetch whatever a repo the git server ends with the error message
...
Don't forget to reset/delete the sslVerify statement in ~/.gitconfig
Useful log commands
| Code Block | ||||
|---|---|---|---|---|
| ||||
# graphical illustration of branches git log --graph --full-history --all --pretty=format:'%Cred%h%Creset %ad %s %C(yellow)%d%Creset %C(bold blue)<%an>%Creset' --date=short git log --graph --oneline --decorate --all # example output * f1270f7 (HEAD, master) update README * 9af9d3b add a README * 694971d update phrase to hola world | * e3eb223 (mundo) add more tests | * 7cff591 add testing script | * c3ffff1 changed text to hello mundo |/ * b7dcc89 initial hello world code |