Setting up git - Revision history

Sergeirocks100: 45 revisions imported

2022-01-19T16:35:17Z

45 revisions imported

← Older revision	Revision as of 16:35, 19 January 2022
(No difference)

tgstation>SpaceManiac: Fix weird line break in author's note

2020-12-25T07:47:47Z

Fix weird line break in author's note

← Older revision		Revision as of 07:47, 25 December 2020
Line 31:		Line 31:
	\|Image=Warningsign.png		\|Image=Warningsign.png
	\|Note=		\|Note=
	Now that your git is set up, you may want to also download [https://code.visualstudio.com/ Visual Studio Code], as there are plugins and add-ons that make working with byond code and the rest of the codebase		Now that your git is set up, you may want to also download [https://code.visualstudio.com/ Visual Studio Code], as there are plugins and add-ons that make working with byond code and the rest of the codebase significantly easier, but you can avoid that for now if you just want to get familiar with gitbash and the codebase (But #coderbus will ask you to download it at some point anyway).

	significantly easier, but you can avoid that for now if you just want to get familiar with gitbash and the codebase (But #coderbus will ask you to download it at some point anyway).
	\|Color=#00F		\|Color=#00F
	}}		}}

tgstation>SpaceManiac: Remove extra word in remote-add-upstream command

2020-12-25T05:50:29Z

Remove extra word in remote-add-upstream command

← Older revision		Revision as of 05:50, 25 December 2020
Line 23:		Line 23:
	'''Step 6:'''		'''Step 6:'''
	Next, also in command line, enter: '''''cd tgstation'''''		Next, also in command line, enter: '''''cd tgstation'''''
	Then, finally, enter: '''''git remote add upstream ~~git~~ https://github.com/tgstation/tgstation.git'''''		Then, finally, enter: '''''git remote add upstream https://github.com/tgstation/tgstation.git'''''

	This should cover everything you need to get started, but now lets talk about actually USING git for something practical.		This should cover everything you need to get started, but now lets talk about actually USING git for something practical.

tgstation>SpaceManiac: Move TortoiseGit to its own page, add Goonstation link

2020-12-25T05:40:55Z

Move TortoiseGit to its own page, add Goonstation link

Show changes

tgstation>SpaceManiac: Remove "Game Resources" category

2020-12-04T03:47:35Z

Remove "Game Resources" category

← Older revision		Revision as of 03:47, 4 December 2020
Line 244:		Line 244:
	</div>		</div>

	~~----~~

	{{Contribution guides}}		{{Contribution guides}}
	~~[[Category:Game Resources]] [[Category:Guides]]~~

tgstation>SpaceManiac: Use GitHub link for Coding Standards

2020-11-30T08:10:47Z

Use GitHub link for Coding Standards

← Older revision		Revision as of 08:10, 30 November 2020
Line 192:		Line 192:
	* A commit is confirmed change of the files in your repo, it's how you make changes permanently to the files in your repo, so try not to commit without making sure it works (though subsequent commits can fix it).		* A commit is confirmed change of the files in your repo, it's how you make changes permanently to the files in your repo, so try not to commit without making sure it works (though subsequent commits can fix it).
	* As said before, you should use different branches to separate your commits/changes. Don't commit to master. It should be clean, so you can fall back on it if needed.		* As said before, you should use different branches to separate your commits/changes. Don't commit to master. It should be clean, so you can fall back on it if needed.
	* To make your commits, you need to edit the files using BYOND's inbuilt editing tools. Make sure to [~~[Coding Standards\|~~follow coding standards]] when making your changes! When you're finished, right click the folder you're working with and choose '''Git Commit -> "[Your Branch Name]"''' (Example: Git Commit -> "My_First_Branch")		* To make your commits, you need to edit the files using BYOND's inbuilt editing tools. Make sure to [https://github.com/tgstation/tgstation/blob/master/.github/CONTRIBUTING.md follow coding standards] when making your changes! When you're finished, right click the folder you're working with and choose '''Git Commit -> "[Your Branch Name]"''' (Example: Git Commit -> "My_First_Branch")
	* You can then select only the files you want to be committed by ticking or unticking them. You should also write a detailed commit summary, detailing what happened in that commit.		* You can then select only the files you want to be committed by ticking or unticking them. You should also write a detailed commit summary, detailing what happened in that commit.
	* Click '''Ok''' and the commit will be committed to your local repo!		* Click '''Ok''' and the commit will be committed to your local repo!

tgstation>Specrat: Undo revision 34308 by Specrat (talk)

2020-10-21T19:43:10Z

Undo revision 34308 by Specrat (talk)

← Older revision		Revision as of 19:43, 21 October 2020
Line 21:		Line 21:

	'''Step 5:'''		'''Step 5:'''
	From your command line prompt, enter '''''git clone <yourforkurlfromstep3.> ~~--depth=1~~'''''. This tells git to take the code from that public github fork, and paste it into your designated folder.		From your command line prompt, enter '''''git clone <yourforkurlfromstep3.>'''''. This tells git to take the code from that public github fork, and paste it into your designated folder.

	'''Step 6:'''		'''Step 6:'''

tgstation>Specrat: saves a large amount of space for anyone unfortunate enough to read this guide

2020-10-21T19:37:26Z

saves a large amount of space for anyone unfortunate enough to read this guide

← Older revision		Revision as of 19:37, 21 October 2020
Line 21:		Line 21:

	'''Step 5:'''		'''Step 5:'''
	From your command line prompt, enter '''''git clone <yourforkurlfromstep3.>'''''. This tells git to take the code from that public github fork, and paste it into your designated folder.		From your command line prompt, enter '''''git clone <yourforkurlfromstep3.> --depth=1'''''. This tells git to take the code from that public github fork, and paste it into your designated folder.

	'''Step 6:'''		'''Step 6:'''

tgstation>Arcanemusic: Added URL to VSC in the tooltip, we had a guy taking about how they wanted vsc but got a version of visual studio with a liscence. Don't be that guy,

2020-08-17T16:18:30Z

Added URL to VSC in the tooltip, we had a guy taking about how they wanted vsc but got a version of visual studio with a liscence. Don't be that guy,

← Older revision		Revision as of 16:18, 17 August 2020
Line 33:		Line 33:
	\|Image=Warningsign.png		\|Image=Warningsign.png
	\|Note=		\|Note=
	Now that your git is set up, you may want to also download Visual Studio Code, as there are plugins and add-ons that make working with byond code and the rest of the codebase		Now that your git is set up, you may want to also download [https://code.visualstudio.com/ Visual Studio Code], as there are plugins and add-ons that make working with byond code and the rest of the codebase

	significantly easier, but you can avoid that for now if you just want to get familiar with gitbash and the codebase (But #coderbus will ask you to download it at some point anyway).		significantly easier, but you can avoid that for now if you just want to get familiar with gitbash and the codebase (But #coderbus will ask you to download it at some point anyway).

tgstation>Arcanemusic: Didn't like that table, reformatted.

2020-08-17T16:16:44Z

Didn't like that table, reformatted.

← Older revision		Revision as of 16:16, 17 August 2020
Line 42:		Line 42:
	----		----

	~~'''REGULAR USE'''~~		{\| class="wikitable" style="font-style:italic;"
			\|- style="font-style:normal; font-weight:bold;"
	When you want to do something with gitbash, there are several commands you should memorise, or at least have save someplace to make your life easier.		! style="text-decoration:underline;" \| GITBASH COMMAND
			! style="font-weight:normal;" \| When you want to do something with gitbash, there are several commands you should memorise, or at least have save someplace to make your life easier.
	~~{\| class="wikitable" style="font-weight:bold;"~~
	\|-		\|-
	~~! style="text-decoration:underline;"~~ \| git status		\| git status
	! style="font-~~weight~~:normal;" \| Tells you where you are, or what issues are potentially occuring with pushing or pulling your files. Use this if you forget what branch you're currently on, or why you can't updated/push your code, as it usually always has some clues.		\| style="font-style:normal;" \| Tells you where you are, or what issues are potentially occuring with pushing or pulling your files. Use this if you forget what branch you're currently on, or why you can't updated/push your code, as it usually always has some clues.
	\|-		\|-
	~~\| style="text-decoration:underline;"~~ \| git checkout master		\| git checkout master
	\| style="font-~~weight~~:normal;" \| Attempt to jump to your master branch, which comes standard with any fork. This will run into issues if you have uncommitted changes that haven't been pushed, or there's otherwise lingering code that might run into issues if you leave your current fork. Side note, Don't make changes on your master branch! Version control is the benefit to using all of this, so that you can make PR-able code changes on your branches, but you can update against your own master to have a clean version of the code for testing/changes.		\| style="font-style:normal;" \| Attempt to jump to your master branch, which comes standard with any fork. This will run into issues if you have uncommitted changes that haven't been pushed, or there's otherwise lingering code that might run into issues if you leave your current fork. Side note, Don't make changes on your master branch! Version control is the benefit to using all of this, so that you can make PR-able code changes on your branches, but you can update against your own master to have a clean version of the code for testing/changes.
	\|-		\|-
	~~\| style="text-decoration:underline;"~~ \| git fetch upstream		\| git fetch upstream
	\| style="font-~~weight~~:normal;" \| Will go to the live version of the code, on github, and attempt to update your local master with the new changes that have been merged.		\| style="font-style:normal;" \| Will go to the live version of the code, on github, and attempt to update your local master with the new changes that have been merged.
	\|-		\|-
	~~\| style="text-decoration:underline;"~~ \| git reset upstream/master --hard		\| git reset upstream/master --hard
	\| style="font-~~weight~~:normal;" \| Force reset your current branch to the state of the live master version of the code. Take note of that --hard tag at the end. This means that it will do this forcefully, and obliterate any potential changes that have been made to your master branch. Remember, keep changes on a fork!		\| style="font-style:normal;" \| Force reset your current branch to the state of the live master version of the code. Take note of that --hard tag at the end. This means that it will do this forcefully, and obliterate any potential changes that have been made to your master branch. Remember, keep changes on a fork!
	\|-		\|-
	~~\| style="text-decoration:underline;"~~ \| git push -f		\| git push -f
	\| style="font-~~weight~~:normal;" \| Send your locally completed commits from your branch back to the Github website.		\| style="font-style:normal;" \| Send your locally completed commits from your branch back to the Github website.
	\|}		\|}

	----		----
	'''MAKING A CODE CHANGE'''		'''MAKING A CODE CHANGE'''