Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
| tips:git [2018/09/18 14:03] – [integrate changes from one branch into another branch] scipio | tips:git [2019/03/13 09:30] (current) – [apache git] scipio | ||
|---|---|---|---|
| Line 74: | Line 74: | ||
| + | ===== create branch with current changes ===== | ||
| + | |||
| + | < | ||
| + | git checkout -b newBranch | ||
| + | </ | ||
| + | |||
| + | ===== tag ===== | ||
| + | |||
| + | < | ||
| + | git tag -a v1.1 -m " | ||
| + | git push origin v1.1 | ||
| + | </ | ||
| ===== new remote branch ===== | ===== new remote branch ===== | ||
| Line 191: | Line 203: | ||
| </ | </ | ||
| + | ===== submodule ===== | ||
| + | |||
| + | < | ||
| + | cd < | ||
| + | git checkout master | ||
| + | git branch -u origin/ | ||
| + | cd < | ||
| + | git config -f .gitmodules submodule.< | ||
| + | </ | ||