Documentation

Differences

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

Link to this comparison view

Both sides previous revision Previous revision
git [2011/10/26 17:11]
Franz Links to guidelines changed to v1.4:conventions
git [2012/10/08 19:25] (current)
Studio384 1.5 update
Line 38: Line 38:
 {{  :​git_lines.png ​ }} {{  :​git_lines.png ​ }}
  
-**Note:** For FluxBB development [[v1.4:​conventions#​line-breaks-and-encoding|we use]] LF (UNIX style) line breaks. If you chose to handle this manually you should ensure your text editor will save files with UNIX style line breaks. If you would rather let Git automatically handle the line breaks then the //Checkout Windows-style,​ commit Unix-style line endings// option is the easiest.+**Note:** For FluxBB development [[v1.5:​conventions#​line-breaks-and-encoding|we use]] LF (UNIX style) line breaks. If you chose to handle this manually you should ensure your text editor will save files with UNIX style line breaks. If you would rather let Git automatically handle the line breaks then the //Checkout Windows-style,​ commit Unix-style line endings// option is the easiest.
  
 Once you have msysgit installed you can install a GUI if you find it easier than working from the command line. For users coming from SVN the [[http://​code.google.com/​p/​tortoisegit/​|TortoiseGit]] client will probably feel rather familiar. Once you have msysgit installed you can install a GUI if you find it easier than working from the command line. For users coming from SVN the [[http://​code.google.com/​p/​tortoisegit/​|TortoiseGit]] client will probably feel rather familiar.
Line 123: Line 123:
 <​code>​git branch -a</​code>​ <​code>​git branch -a</​code>​
 ==== Changing ==== ==== Changing ====
-FluxBB currently has 2 main branches - fluxbb-1.and fluxbb-2.0. After initially cloning the repository you will have the fluxbb-1.branch checked out. To change to the fluxbb-2.0 branch you will need to set up a new local branch which tracks the remote branch, using:+FluxBB currently has 2 main branches - fluxbb-1.and fluxbb-2.0. After initially cloning the repository you will have the fluxbb-1.branch checked out. To change to the fluxbb-2.0 branch you will need to set up a new local branch which tracks the remote branch, using:
 <​code>​git checkout -b fluxbb-2.0 origin/​fluxbb-2.0</​code>​ <​code>​git checkout -b fluxbb-2.0 origin/​fluxbb-2.0</​code>​
 You are now on the fluxbb-2.0 branch. You can switch back by using: You are now on the fluxbb-2.0 branch. You can switch back by using:
-<​code>​git checkout fluxbb-1.4</​code>​+<​code>​git checkout fluxbb-1.5</​code>​
  
 **Remember:​** You can always see which branches you have locally, and which branch you are currently on, using: **Remember:​** You can always see which branches you have locally, and which branch you are currently on, using:
Line 183: Line 183:
 A new tag can be created by entering ''​git tag [name]''​. For example: A new tag can be created by entering ''​git tag [name]''​. For example:
  
-<​code>​git tag 1.4.1</​code>​+<​code>​git tag 1.4.9</​code>​
  
 ==== Publishing ==== ==== Publishing ====
Line 189: Line 189:
 To publish or share a tag user ''​git push origin [name]''​. For example: To publish or share a tag user ''​git push origin [name]''​. For example:
  
-<​code>​git push origin 1.4.1</​code>​+<​code>​git push origin 1.4.9</​code>​
  
 ===== Using submodules ===== ===== Using submodules =====