Differences

This shows you the differences between two versions of the page.

Link to this comparison view

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:27]
rachad [Change <user> to your username:]
en:manual:contrib:git_contribution_guide [2023/02/21 10:34]
i3_relativism Fix simplistic titles
Line 1: Line 1:
 <note warning> This page is still in progress, so please dont aprove this draft yet!</note> <note warning> This page is still in progress, so please dont aprove this draft yet!</note>
-====== Hyperbola Source Contribution Guidelines ======+====== Git Contribution Guidelines ======
 ===== SSH ===== ===== SSH =====
  
Line 82: Line 82:
  
 <code bash> <code bash>
-git add file1 file2 +git add .
-git commit -m "Add your commit comment here"+
 </code> </code>
  
 <code bash> <code bash>
-git commit -a -m "Add your commit comment here"+git commit -sam "Add your commit comment here"
 </code> </code>
  
-To push and pull from the team repository make these changes inside team/packages/extra/.git/config  
  
-<note tip>This is used to add all commits, -am might also be used to do both at the same time</note> 
  
-==== This is the config file found in GIT/team/packages/extra/.git Change <user> to your username: ====+<note tip>To push and pull from the team repository make these changes inside team/packages/extra/.git/config </note> 
 + 
 +==== Change <user> to your username: ====
  
 <code bash> <code bash>
Line 134: Line 133:
 </code> </code>
  
-==== Git Revert ====+===== Reverting commits =====
  
 We countinue with more git commands We countinue with more git commands
Line 164: Line 163:
 </code> </code>
  
-==== 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:
 </code> </code>
  
-==== 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.