зеркало из https://github.com/mozilla/elmo.git
Updated Home (markdown)
Родитель
79d549dbd2
Коммит
33b86ade66
17
Home.md
17
Home.md
|
@ -1,11 +1,18 @@
|
|||
Stas says this is good practice to get patches reviewed in bugzilla and then the comments addressed and the commit message fixed:
|
||||
|
||||
```bash
|
||||
git flow feature start 600000-new-feature
|
||||
# ...write code...
|
||||
git commit
|
||||
git show HEAD > patch.diff
|
||||
# get review
|
||||
git commit more
|
||||
# when ready
|
||||
git flow feature rebase -i <name>
|
||||
git flow feature finish <name>
|
||||
# ...attach the patch on bugzilla and get review...
|
||||
# ...address reviewer's comments
|
||||
git commit
|
||||
git show HEAD > patch.diff
|
||||
# ...once you get r+, you're ready to merge onto develop...
|
||||
git flow feature rebase -i 600000-new-feature
|
||||
# ...leave the first commit as 'pick'...
|
||||
# ...and 'squash' all other commits...
|
||||
# ...you're done!
|
||||
git flow feature finish 600000-new-feature
|
||||
```
|
Загрузка…
Ссылка в новой задаче