Activity Team/Git Tutorial - Revision history

Erilyth: /* Propose changes to someone else's project */

2016-12-06T09:50:56Z

Propose changes to someone else's project

← Older revision		Revision as of 05:50, 6 December 2016
Line 158:		Line 158:
	3. Submit a pull request to the project owner.		3. Submit a pull request to the project owner.

	4. If the project owner likes your work, they might ~~pull~~ your fix ~~into~~ the original repository!		4. If the project owner likes your work, they might merge your fix and add it to the original repository!

	=== Sending a pull-request ===		=== Sending a pull-request ===

Emilyo11: /* Sending a pull-request */

2016-12-06T04:46:40Z

Sending a pull-request

← Older revision		Revision as of 00:46, 6 December 2016
Line 160:		Line 160:
	4. If the project owner likes your work, they might pull your fix into the original repository!		4. If the project owner likes your work, they might pull your fix into the original repository!

	== Sending a pull-request ==		=== Sending a pull-request ===
	In order to request the repository's owner to consider the changes that you made in your repository and include them in the main code, you will need to make a pull request. In order to do this, just open up your repository page, `https://github.com/yourUserName/RepoName`, now you will a line just above the contents saying something like `This branch is 1 commit ahead of walterbender:master.` and you will also thus be able to see a button to create a New Pull Request for the same, then you can review the changes made and the commits to be added in that request and also a message box for the message you would want others to read, describing the changes you made. Then you can proceed to successfully creating a pull request, which will then be reviewed by others. And you can discuss on the very same page regarding whatever needs to be done. And if all is perfect, your pull request will be merged into the main code!		In order to request the repository's owner to consider the changes that you made in your repository and include them in the main code, you will need to make a pull request. In order to do this, just open up your repository page, `https://github.com/yourUserName/RepoName`, now you will a line just above the contents saying something like `This branch is 1 commit ahead of walterbender:master.` and you will also thus be able to see a button to create a New Pull Request for the same, then you can review the changes made and the commits to be added in that request and also a message box for the message you would want others to read, describing the changes you made. Then you can proceed to successfully creating a pull request, which will then be reviewed by others. And you can discuss on the very same page regarding whatever needs to be done. And if all is perfect, your pull request will be merged into the main code!

Line 337:		Line 337:
	=== Close Issue ===		=== Close Issue ===

	Once your changes are merged, you should close your issue. Be sure to thank everyone who helped you out along the way :)		Once your changes are merged, you should close your issue. Be sure to thank everyone who helped you out along the way :)

	== Other Notes ==		== Other Notes ==

Emilyo11 at 04:44, 6 December 2016

2016-12-06T04:44:39Z

Show changes

Quozl at 02:33, 6 December 2016

2016-12-06T02:33:47Z

← Older revision		Revision as of 22:33, 5 December 2016
Line 263:		Line 263:
	git tag -m "Release 36" v36 HEAD		git tag -m "Release 36" v36 HEAD
	git push --tags		git push --tags


	[[Category:Activity Team]]		[[Category:Activity Team]]
	[[Category:HowTo]]		[[Category:HowTo]]

Daksh Shah: /* Branches */

2015-12-12T17:57:35Z

Branches

@@ Line 157: / Line 157: @@
 When you create a branch in your project, you're creating an environment where you can try out new ideas. Changes you make on a branch don't affect the master `branch`, so you're free to experiment and commit changes, safe in the knowledge that your branch won't be merged until it's ready to be reviewed by someone you're collaborating with.
 ==== Tip ====
@@ Line 162: / Line 204: @@
 There's only one rule: anything in the master branch is always deployable.
 Because of this, it's extremely important that your new branch is created off of master when working on a feature or a fix. Your branch name should be descriptive
 === Commits ===

Daksh Shah at 17:32, 12 December 2015

2015-12-12T17:32:36Z

← Older revision		Revision as of 13:32, 12 December 2015
Line 53:		Line 53:
	You should only need to create a key once, unless you change to another system, or a different Sugar-on-a-Stick drive, or you think your private key was compromised. If you do it again, you must also add the new key to GitHub as described in the next section.		You should only need to create a key once, unless you change to another system, or a different Sugar-on-a-Stick drive, or you think your private key was compromised. If you do it again, you must also add the new key to GitHub as described in the next section.

	=== Setup Git for Windows 8 ===		=== Setup Git Desktop for Windows 7 or later ===

	~~GitHub is one way you~~ can ~~set up Git on Windows 8. It can be downloaded~~ from [~~http~~://~~github~~-~~windows.s3.amazonaws~~.com/~~GitHubSetup.exe~~ here]		You can either directly download and install git from [https://git-scm.com/downloads here]

	~~Once downloaded and installed~~, ~~Git Shell~~ can ~~be used to execute Git commands~~.		Or you can set up github desktop, which gives you a GUI to do a lot of things. You can download it from [https://desktop.github.com/ here]

	=== Add SSH Key ===		=== Add SSH Key ===
Line 73:		Line 73:
	If you do not use git on your system for any other project, you can configure git:		If you do not use git on your system for any other project, you can configure git:

	git config -~~f ~/.gitconfig~~ user.email ~~<email-you-used-for-registering-project>~~		git config --global user.email "your_email@example.com"
	git config -~~f ~/.gitconfig~~ user.name ~~<your-~~name>		git config --global user.name "Your name"

	You should only need to do this once on a system.		You should only need to do this once on a system.

Daksh Shah: Adding the GitHub Workflow and updated the page :)

2015-12-12T17:22:33Z

Adding the GitHub Workflow and updated the page :)

Show changes

Ignacio Rodríguez: /* Create a Project */

2014-12-02T21:43:11Z

Create a Project

← Older revision		Revision as of 17:43, 2 December 2014
Line 69:		Line 69:
	=== Create a Project ===		=== Create a Project ===

	Log in to ~~Gitorious~~ at http://github.com and go [https://github.com/new here]. Choose a repository name, and write a description.		Log in to GitHub at http://github.com and go [https://github.com/new here]. Choose a repository name, and write a description.

	=== Create Local Repository ===		=== Create Local Repository ===

Ignacio Rodríguez: /* Add SSH Key */

2014-12-02T21:42:50Z

Add SSH Key

← Older revision		Revision as of 17:42, 2 December 2014
Line 63:		Line 63:
	Log in to GitHub at http://github.com and go [https://github.com/settings/ssh here] click on 'Add Ssh Key'. Choose a title. Open your public key in a text editor, web browser, or even ''cat'' command, and then copy and paste the key into the text entry field. Click on ''Save''.		Log in to GitHub at http://github.com and go [https://github.com/settings/ssh here] click on 'Add Ssh Key'. Choose a title. Open your public key in a text editor, web browser, or even ''cat'' command, and then copy and paste the key into the text entry field. Click on ''Save''.

	Once you do this, ~~Gitorious~~ trusts SSH connection from your system because your system has the private key, and ~~Gitorious~~ has the public key. You should only need to do this once, unless you change to another system.		Once you do this, GitHub trusts SSH connection from your system because your system has the private key, and GitHub has the public key. You should only need to do this once, unless you change to another system.

	(With ssh-keygen you can specify the name of your key file. Using this feature is not a good idea, because we haven't tested it. Keys should generally be located in <tt>~/.ssh/id_rsa.pub</tt> or <tt>~/.ssh/id_dsa.pub</tt>.)		(With ssh-keygen you can specify the name of your key file. Using this feature is not a good idea, because we haven't tested it. Keys should generally be located in <tt>~/.ssh/id_rsa.pub</tt> or <tt>~/.ssh/id_dsa.pub</tt>.)

Ignacio Rodríguez: /* Create Local Repository */

2014-12-02T21:42:32Z

Create Local Repository

← Older revision		Revision as of 17:42, 2 December 2014
Line 73:		Line 73:
	=== Create Local Repository ===		=== Create Local Repository ===

	Clone it from ~~Gitorious~~:		Clone it from GitHub:
	git clone git@github.com:username/${SLUG}.git ${SLUG}.git		git clone git@github.com:username/${SLUG}.git ${SLUG}.git