Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision Next revision Both sides next revision | ||
|
en:manual:contrib:git_contribution_guide [2022/03/30 23:10] rachad [Change <user> to your username:] |
en:manual:contrib:git_contribution_guide [2023/02/21 10:35] i3_relativism [Edit, add and remove files] |
||
|---|---|---|---|
| Line 1: | Line 1: | ||
| <note warning> This page is still in progress, so please dont aprove this draft yet!</ | <note warning> This page is still in progress, so please dont aprove this draft yet!</ | ||
| - | ====== | + | ====== |
| ===== SSH ===== | ===== SSH ===== | ||
| Line 77: | Line 77: | ||
| </ | </ | ||
| - | ==== Edit, add and remove files ===== | + | ===== Edit, add and remove files ====== |
| Create the files you want to add to extra repository and type: | Create the files you want to add to extra repository and type: | ||
| <code bash> | <code bash> | ||
| - | git add file1 file2 | + | git add . |
| - | git commit -m "Add your commit comment here" | + | |
| </ | </ | ||
| <code bash> | <code bash> | ||
| - | git commit -a -m "Add your commit comment here" | + | git commit -sam "Add your commit comment here" |
| </ | </ | ||
| - | To push and pull from the team repository make these changes inside team/ | ||
| - | <note tip>This is used to add all commits, -am might also be used to do both at the same time</ | + | |
| + | <note tip>To push and pull from the team repository make these changes inside team/ | ||
| ==== Change < | ==== Change < | ||
| Line 121: | Line 120: | ||
| </ | </ | ||
| - | To merge commits | + | To merge commits |
| <code bash> | <code bash> | ||
| - | git checkout | + | git checkout < |
| - | git merge < | + | git merge master |
| </ | </ | ||
| Line 131: | Line 130: | ||
| <code bash> | <code bash> | ||
| - | git push origin master | + | git push # to push commits |
| </ | </ | ||
| - | ==== Git Revert | + | ===== Reverting commits ===== |
| We countinue with more git commands | We countinue with more git commands | ||
| Line 164: | Line 163: | ||
| </ | </ | ||
| - | ==== Git rebase | + | ===== Rebasing codebase ===== |
| However, please don't use this command in master, for that reason i'm insisting for each user to create their own branches. | However, please don't use this command in master, for that reason i'm insisting for each user to create their own branches. | ||
| Line 174: | Line 173: | ||
| </ | </ | ||
| - | ==== Git push ==== | + | ===== Pushing changes ===== |
| Remember to push those commits to master and milky-way-v0.4 branches if you consider those ones stable and tested by you first because I will pull them to our build server to build and push to repos. | Remember to push those commits to master and milky-way-v0.4 branches if you consider those ones stable and tested by you first because I will pull them to our build server to build and push to repos. | ||
| Line 183: | Line 182: | ||
| </ | </ | ||
| - | ==== Conclusion ==== | + | ====== Conclusion |
| So, in short, you have 2 ways to push your commits: | So, in short, you have 2 ways to push your commits: | ||