This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision | ||
dev:git [2022/10/04 13:37] tomas [Prace s kodem, schvalovani zmen, historie] |
dev:git [2025/01/14 13:26] (current) tomas [užitešné nástroje] |
||
---|---|---|---|
Line 5: | Line 5: | ||
[[https:// | [[https:// | ||
[[https:// | [[https:// | ||
+ | |||
+ | ====užitečné nástroje==== | ||
+ | [[https:// | ||
+ | conventional commits ... prefix konvence commitů pro lepší rozpoznání účelu a pro automatické generování changelogu\\ | ||
+ | sme\\ | ||
+ | [[https:// | ||
+ | [[https:// | ||
====git promenne==== | ====git promenne==== | ||
Line 60: | Line 67: | ||
'' | '' | ||
'' | '' | ||
+ | '' | ||
+ | '' | ||
+ | '' | ||
'' | '' | ||
'' | '' | ||
Line 83: | Line 93: | ||
git commit -a -d %%" | git commit -a -d %%" | ||
git checkout master ... prepne zpet do puvodni vetve\\ | git checkout master ... prepne zpet do puvodni vetve\\ | ||
- | git merge hotfix1 ... sjednoti zmeny - prijme zmeny z hotfixu do aktualni branche\\ | ||
git branch -d hotfix1 ... smaze vetev hotfix1\\ | git branch -d hotfix1 ... smaze vetev hotfix1\\ | ||
git branch ... seznam vetvi, ukaze aktualni\\ | git branch ... seznam vetvi, ukaze aktualni\\ | ||
git checkout -b hotfix1 origin/ | git checkout -b hotfix1 origin/ | ||
+ | git rebase master ... jako merge, ale není fast forward, feature branch A-B-C-D, master branch A-B-E-F, vysledek A-B-E-F-C-D | ||
+ | git merge master ... sjednoti zmeny - prijme zmeny z master do aktualni branche, feature branch A-B-C-D, master branch A-B-E-F, vysledek A-B-C-D-E-F\\ | ||
====git vnitrnosti==== | ====git vnitrnosti==== |