Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
en:manual:contrib:git_contribution_guide [2022/03/28 03:19] i3_relativism [Comands] |
en:manual:contrib:git_contribution_guide [2023/02/22 20:26] (current) throgh [Clonning repos] |
||
|---|---|---|---|
| Line 1: | Line 1: | ||
| - | <note warning> This page is still in progress, so please dont aprove this draft yet!</ | + | ====== |
| - | ====== | + | |
| - | + | ||
| - | < | + | |
| ===== SSH ===== | ===== SSH ===== | ||
| Line 12: | Line 8: | ||
| ssh -p 51100 < | ssh -p 51100 < | ||
| </ | </ | ||
| + | |||
| + | < | ||
| ==== Comands ==== | ==== Comands ==== | ||
| Line 21: | Line 19: | ||
| * ' | * ' | ||
| - | # type the command make for example | + | type the command |
| - | # when it says Please specify the address of the Git repository: | + | when it says < |
| - | # its asking for the folder name | + | |
| - | # for example | + | for example |
| - | # like guide.git were i have uploaded my file | + | |
| - | # then it prints Please specify the name of the Git repository: | + | to create " |
| - | # you cant type: " | + | |
| - | # to create " | + | <code bash> |
| + | guide | ||
| + | </code> | ||
| To create folders in your local machine, open your terminal and type as follow: | To create folders in your local machine, open your terminal and type as follow: | ||
| Line 38: | Line 38: | ||
| To end up create these folders: | To end up create these folders: | ||
| + | <code bash> | ||
| # GIT/ | # GIT/ | ||
| # GIT/ | # GIT/ | ||
| Line 43: | Line 44: | ||
| # GIT/ | # GIT/ | ||
| # GIT/ | # GIT/ | ||
| + | </ | ||
| + | |||
| + | ===== Cloning repositories ===== | ||
| Now go to team/ | Now go to team/ | ||
| Line 50: | Line 54: | ||
| </ | </ | ||
| - | [x@localhost packages]$ | + | Clone the repositories |
| - | Clone the repositories: | + | |
| <code bash> | <code bash> | ||
| Line 58: | Line 61: | ||
| </ | </ | ||
| - | Then cd to the extra repository: | + | ===== Create your branch ===== |
| + | |||
| + | cd (=change directory) into to the extra repository: | ||
| <code bash> | <code bash> | ||
| Line 67: | Line 72: | ||
| <code bash> | <code bash> | ||
| - | git branch < | + | git branch < |
| git checkout < | git checkout < | ||
| </ | </ | ||
| + | |||
| + | ===== 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" | + | |
| - | | + | |
| </ | </ | ||
| - | |||
| - | <note tip>This is used to add all commits, -am might also be used to do both at the same time</ | ||
| <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/ | ||
| - | === Change < | + | |
| + | <note tip>To push and pull from the team repository make these changes inside team/ | ||
| + | |||
| + | ==== Change < | ||
| <code bash> | <code bash> | ||
| Line 102: | Line 107: | ||
| remote = origin | remote = origin | ||
| merge = refs/ | merge = refs/ | ||
| - | [branch " | ||
| - | remote = origin | ||
| - | merge = refs/ | ||
| [branch "< | [branch "< | ||
| remote = origin | remote = origin | ||
| Line 117: | Line 119: | ||
| </ | </ | ||
| - | To merge commits | + | To merge commits |
| <code bash> | <code bash> | ||
| - | git checkout | + | git checkout < |
| - | git merge < | + | git merge master |
| </ | </ | ||
| Line 127: | Line 129: | ||
| <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 160: | Line 162: | ||
| </ | </ | ||
| - | ==== 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 170: | Line 172: | ||
| </ | </ | ||
| - | ==== 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 179: | Line 181: | ||
| </ | </ | ||
| - | ==== Conclusion ==== | + | ====== Conclusion |
| So, in short, you have 2 ways to push your commits: | So, in short, you have 2 ways to push your commits: | ||
| Line 187: | Line 189: | ||
| === Aknowlegments === | === Aknowlegments === | ||
| Hyperbola Development Team git repository use: | Hyperbola Development Team git repository use: | ||
| + | Copyright 2021 rachad | ||
| Copyright 2021 André Silva | Copyright 2021 André Silva | ||
| Copyright 2021 Quiliro Ordóñez | Copyright 2021 Quiliro Ordóñez | ||
| - | Copyright 2021 rachad | ||
| GNU Free Documentation License | GNU Free Documentation License | ||