Git/Tutorial - Revision history

Mm: /* Creating an Online Repository */

2015-04-21T13:54:08Z

Creating an Online Repository

← Older revision		Revision as of 13:54, 21 April 2015
Line 433:		Line 433:
	So, let's add the remote origin (btw, this will also work via ssh)		So, let's add the remote origin (btw, this will also work via ssh)

	git remote add origin ssh://myserver.com~~</source>~~		git remote add origin ssh://myserver.com


	== Push Changes to the Server ==		== Push Changes to the Server ==

Mm: /* Branching */

2015-04-21T13:52:19Z

Branching

← Older revision		Revision as of 13:52, 21 April 2015
Line 307:		Line 307:
	Create a new branch		Create a new branch

	git branch testing		git branch -b testing

	you can also add -v to see the latest commit:		you can also add -v to see the latest commit:
Line 392:		Line 392:

	'''Remember that up until this point, we were using git locally. Now, let's create an online repository to work with others'''		'''Remember that up until this point, we were using git locally. Now, let's create an online repository to work with others'''



	== Using Remote Git Servers ==		== Using Remote Git Servers ==

Mm: custom editor

2013-05-30T09:16:05Z

custom editor

← Older revision		Revision as of 09:16, 30 May 2013
Line 23:		Line 23:
	git config --global color.status auto		git config --global color.status auto
	git config --global color.branch auto		git config --global color.branch auto

			Sometimes you have to enter messages in a terminal editor and the default may be vim or emacs. If you like to use another editor, there's this global option:

			git config --global core.editor "nano"

	These settings are global (for your machine), so you only need to do this once.		These settings are global (for your machine), so you only need to do this once.


	== Create the Project Folder ==		== Create the Project Folder ==

Mm: /* GUI or not to GUI */

2013-04-18T13:12:01Z

GUI or not to GUI

← Older revision		Revision as of 13:12, 18 April 2013
Line 278:		Line 278:

	* for [http://mac.github.com Mac]		* for [http://mac.github.com Mac]
	* for [http://windows.github.com Windows])		* for [http://windows.github.com Windows]

	Drag your project folder onto the app.		Drag your project folder onto the app.
Line 285:		Line 285:

	While we're still local, let's explore another really powerful git feature:		While we're still local, let's explore another really powerful git feature:


	== Branching ==		== Branching ==

Mm: Fixed headline numbering

2013-04-18T13:10:03Z

Fixed headline numbering

← Older revision		Revision as of 13:10, 18 April 2013
Line 1:		Line 1:
	== 1. Download & Install Git on your Machine ==		== Download & Install Git on your Machine ==

	open up your Terminal / Console and type		open up your Terminal / Console and type
Line 9:		Line 9:


	== 2. Setup ==		== Setup ==

	'''If you're using git for the first time''', you might want to setup some configuration settings:		'''If you're using git for the first time''', you might want to setup some configuration settings:
Line 27:		Line 27:


	== 3. Create the Project Folder ==		== Create the Project Folder ==

	Create or select your project folder, '''c'''hange to this '''d'''ir in terminal and init git. This will create a ".git" folder inside your project. If you want to remove the git version control for whatever reason, you just need to delete this folder		Create or select your project folder, '''c'''hange to this '''d'''ir in terminal and init git. This will create a ".git" folder inside your project. If you want to remove the git version control for whatever reason, you just need to delete this folder
Line 40:		Line 40:


	== 3. Init the Project Folder ==		== Init the Project Folder ==

	Now, let's add git to our new folder:		Now, let's add git to our new folder:
Line 52:		Line 52:
	This is acutally a command, you should remember!		This is acutally a command, you should remember!

	== 4. Adding Files ==		== Adding Files ==

	The status should say something like this:		The status should say something like this:
Line 87:		Line 87:


	== 5. Change Stuff ==		== Change Stuff ==

	Open REAMDE.md and type something.		Open REAMDE.md and type something.
Line 100:		Line 100:


	== 6. Commit Changes ==		== Commit Changes ==

	Commit early and commit often! Really, I mean that! And don't put in glibberish, make a useful comment about what you did:		Commit early and commit often! Really, I mean that! And don't put in glibberish, make a useful comment about what you did:
Line 126:		Line 126:


	== 7. Change Stuff (Again) ==		== Change Stuff (Again) ==

	Repeat step 5 and change the README.md file.		Repeat step 5 and change the README.md file.
Line 169:		Line 169:


	== 8. Commit (Again) ==		== Commit (Again) ==

	Commit early and commit often! Really, I mean that! And don't put in glibberish, make a useful comment about what you did:		Commit early and commit often! Really, I mean that! And don't put in glibberish, make a useful comment about what you did:
Line 212:		Line 212:


	== 9. What's the diff? ==		== What's the diff? ==

	Time for a cup of fresh coffee. Now you have a nice version control system for your project and you can work with git locally.		Time for a cup of fresh coffee. Now you have a nice version control system for your project and you can work with git locally.
Line 273:		Line 273:


	== ~~10.~~ GUI or not to GUI ==		== GUI or not to GUI ==

	Though, if you're not a nerd, you might enjoy a decent graphical user interface. Time to grab the GitHub.app		Though, if you're not a nerd, you might enjoy a decent graphical user interface. Time to grab the GitHub.app
Line 287:		Line 287:


	== ~~11.~~ Branching ==		== Branching ==

	Adding another branch to your git repo is like duplicating the whole project folder (including the git commit history) and working on a second, completely different version. Like a real folder, you can delete this branch later on or (unlike a real folder) merge it with the current main branch.		Adding another branch to your git repo is like duplicating the whole project folder (including the git commit history) and working on a second, completely different version. Like a real folder, you can delete this branch later on or (unlike a real folder) merge it with the current main branch.
Line 393:		Line 393:


	== ~~12.~~ Using Remote Git Servers ==		== Using Remote Git Servers ==

	You can extend your local git repository with an online git server. This has two advantages:		You can extend your local git repository with an online git server. This has two advantages:
Line 415:		Line 415:


	== ~~13.~~ Creating an Online Repository ==		== Creating an Online Repository ==

	If you've uploaded your public SSH key for your machine, you can continue setting up your user account and finally, create a new repository:		If you've uploaded your public SSH key for your machine, you can continue setting up your user account and finally, create a new repository:
Line 436:		Line 436:


	== ~~14.~~ Push Changes to the Server ==		== Push Changes to the Server ==

	Pushing Changes, means uploading to the server. Because you can have more than one remote server in your repository, you have to state its name:		Pushing Changes, means uploading to the server. Because you can have more than one remote server in your repository, you have to state its name:
Line 457:		Line 457:
	</source>		</source>

	== ~~15.~~ Changing Stuff (Again) ==		== Changing Stuff (Again) ==

	This time, we want to simulate someone else changing our sources. The easiest way for this demo, is to go to github.com and edit the Readme file. E.g. apply some formatting ('#' creates a headline), and give it a commit message.		This time, we want to simulate someone else changing our sources. The easiest way for this demo, is to go to github.com and edit the Readme file. E.g. apply some formatting ('#' creates a headline), and give it a commit message.

	== ~~16.~~ Pull or Fetch and Merge ==		== Pull or Fetch and Merge ==

	Git has two commands to update itself from a remote repository:		Git has two commands to update itself from a remote repository:
Line 537:		Line 537:
	* to the official [http://gitref.org/index.html Git Reference @ gitref.org]		* to the official [http://gitref.org/index.html Git Reference @ gitref.org]

	[[Category:~~git~~]]		[[Category:Git]]
	[[Category:Tutorial]]		[[Category:Tutorial]]
	[[Category:Michael Markert]]		[[Category:Michael Markert]]

Mm: created full git tutorial

2013-04-18T13:08:32Z

created full git tutorial

Show changes

Mm: /* 2. Setup */

2013-04-18T07:18:31Z

2. Setup

@@ Line 10: / Line 10: @@
 == 2. Setup ==
-With other revisioning systems, it can be quite a hassle to create an initial setup for a folder, with git this is really easy. Just open up your shell, change the directory to the directory you wish to use git and type:
+'''If you're using git for the first time''', you might want to setup some configuration settings:
 To add a remote git server, type:
@@ Line 23: / Line 35: @@
 But remember, you can use git only on your local computer as well, it is not required to have an online server!
 == Usage ==

Mm: Created

2013-04-15T09:24:49Z

Created

New page

== 1. Download & Install Git on your machine ==

open up your Terminal / Console and type
git version

if this command is unknown, you have to install git
* Mac / Linux: most likely already installed
* All other operating systems: [http://git-scm.com/ git-scm.com]

== 2. Setup ==

With other revisioning systems, it can be quite a hassle to create an initial setup for a folder, with git this is really easy. Just open up your shell, change the directory to the directory you wish to use git and type:

<source lang="bash">cd myProjectPath
git init</source>

To add a remote git server, type:

<source lang="bash">git remote add origin ssh://myserver.com</source>

For example, you can use [https://github.com/ github.com] to host your open source projects, or [https://bitbucket.org/ bitBucket.org]. You will find an excessive online help on how to setup a remote server on github: [http://help.github.com/set-up-git-redirect How-to-Setup github]. Basically, you only need a private/public ssh key and a valid user account.

But remember, you can use git only on your local computer as well, it is not required to have an online server!

== Usage ==

to get the status of your local git repository, query:

<source lang="bash">git status</source>

to add files you type:

<source lang="bash">git add myfile.ext</source>

or to add all:

<source lang="bash">git add *</source>

If you changed something and would like to store these changes as a version, you can "commit" your update:

<source lang="bash">git commit -a -m "comment about change"</source>

At this point, your commit is only local! You can commit as few or as many changes as you like. But at the end of the day, you should push your changes to the server:

<source lang="bash">git push origin master</source>

If you are interested in getting the changes from the server to your local machine, type:

<source lang="bash">git pull</source>

== Summary ==
* <tt>git version</tt>
* <tt>git init</tt>
* <tt>git remote add origin {ssh://myserver.com}</tt>'' (Add remote Server)''
* <tt>git status</tt>
* <tt>git add .</tt>
* <tt>git commit -a -m "minor changes"</tt>
* <tt>git push origin master</tt> ''(Push to remote Server; where 'master' is the name of your current branch)''