Andre: /* 3 Git moments */

2017-02-08T19:12:20Z

3 Git moments

← Older revision		Revision as of 19:12, 8 February 2017
Line 30:		Line 30:

	=3 Git moments=		=3 Git moments=
			http://codingdomain.com/git/partial-commits/git-staging-area.png

	For local (in your computer) Git operations, there are 3 main moments:		For local (in your computer) Git operations, there are 3 main moments:
	* working: editing files		* working: editing files
Line 51:		Line 53:

	* <code>git commit -m "message about what happened in that commit"</code> creates a version or ''commit'' of your project. A accompanying message describes what happen in that ''commit''.		* <code>git commit -m "message about what happened in that commit"</code> creates a version or ''commit'' of your project. A accompanying message describes what happen in that ''commit''.
	* <code>git log</code> show the ''history of commits'', where each commit is shows an author, date, message and hash (a long string of letter and numbers that identifies the commit)		* <code>git log</code> show the ''history of commits'', where each commit is shows an author, date, message and hash (a long string of letter and numbers that identifies the commit)


	=Undoing things=		=Undoing things=

Andre at 18:59, 6 February 2017

2017-02-06T18:59:40Z

← Older revision		Revision as of 18:59, 6 February 2017
Line 1:		Line 1:
	~~[[File~~:GitForArtists.jpg]]		https://mywdka.nl/openaanbod/wp-content/uploads/sites/260/2016/02/GitForArtists-1.jpg

	=Talk Git=		=Talk Git=

Andre at 18:20, 1 February 2017

2017-02-01T18:20:51Z

Show changes

Andre: Created page with "File:GitForArtists.jpg =resources= [http://ndpsoftware.com/git-cheatsheet.html#loc=index; Git Cheatsheet] [http://git-scm.com/ Git home] [https://wubthecaptain.eu/arti..."

2017-01-25T16:57:51Z

Created page with "File:GitForArtists.jpg =resources= [http://ndpsoftware.com/git-cheatsheet.html#loc=index; Git Cheatsheet] [http://git-scm.com/ Git home] [https://wubthecaptain.eu/arti..."

New page

[[File:GitForArtists.jpg]]

=resources=
[http://ndpsoftware.com/git-cheatsheet.html#loc=index; Git Cheatsheet]

[http://git-scm.com/ Git home]

[https://wubthecaptain.eu/articles/why-i-dont-support-github.html blog on Github Terms of Services]

=What is Git?=
Git is frequently described as a '''''distributed version control system'''''.
Initially create by the Linux' father Linus Torvalds in 2005 to facilitate code contributions to the Linux kernel.

'''version control system'''
A system for keeping track of the versions from a file e.g. <code>drawing.svg, drawing.svg.v1, drawing.svg.v2, drawing.svg.v3</code>, while hiding all previous versions.

'''distributed'''
Files from one project are mirror in multiple (collaborators') computers.
Collaborators meaning they can sync their efforts by sending and receiving contribution.

=version control=
Simply version control an image, locally.

<source lang="bash">
mkdir null-local
cd null-local
</source>

create a couple of SVG images and save it in project-dir.

Including in an SVG (code) the tag <code><image xlink:href="other.svg" /></code> you can include the other.svg image in current SVG

You need <code>xmlns:xlink="http://www.w3.org/1999/xlink"</code> inside the svg tag e.g.:
<code><svg width="5cm" height="3cm" viewBox="0 0 5 3" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"></code>

<source lang="bash">
git init
git add myimage.svg
git status
git commit -m "I am starting to version"
git log
</source>

* <code>git init</code> initiates a git repository. Creating a <code>.git/</code> folder where all the Git information will be contained.
* <code>git add</code> when run for the 1st time on file or dir, starts tracking it. (There might be project files you might not want to track).
* <code>git status</code> display untracked and tracked (''staged'' and ''unstaged'' for ''commit'')
* <code>git commit</code> creates a version or ''commit'' of your project. Usually accompanied by a message describing what happen in that ''commit''.
* <code>git log</code> show the ''history of commits'', where each commit is shows an author, date, message and hash

* <code>git add </code> on a file that is being tracked and has been changed, "stage those changes"

==undoing thing / going back==
==discard changes before committing==
* <code>git reset HEAD <file></code> for a 'staged' file
* <code>git reset HEAD <file></code> for a 'unstaged' file

==temporarily checkout past commits==
* <code>git checkout --detach commit# </code> temporarily ''detaches the HEAD'' in order Look how things were in previous commits. "You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout".

To return the HEAD to the latest commit do <code>git checkout master </code> (if the branch you are working in is a master (the default))

==permanently reset to past commits==
EXTREME!

* <code>git reset --hard commit# </code> - resets current HEAD to the specified commit.
Because of flag <code>--hard</code> files in your repository will be removed if they exist prior to the commit.

-----

=remote repositories=
Git facilitates the coordination of contributions from different collaborators in a project.

Each contributor has a local repository, that is a ''''clone'''' of the ''remote repository''.

'''The remote repository acts as the central node from which all the users will receive - ''pull'' - and send - ''push'' contributions.'''

==creating a remote==
In pzwart1 the git server is located in <code>/home/git/</code>

With the repositories stored <code>/home/git/git/</code>

To create a remote, 1 person(normally the admin) start a ''remote (bare) repository'' to push and pull code to and from:
<source lang="bash">
cd /home/git/git
mkdir null.git
cd null.git
git init --bare
</source>

==set remote & first push==
(Note: This step only needs to be performed by the admin, whom will usually set a remote in the local repository).

Inside local folder <code>null-local/</code> dir:
<source lang="bash">
git remote add origin git@pzwart1.wdka.hro.nl:/home/git/git/null.git #add origin remote
git remote -v #view the existing remotes. Only origin remote was added
origin git@pzwart1.wdka.hro.nl:/home/git/git/null.git (fetch)
origin git@pzwart1.wdka.hro.nl:/home/git/git/null.git (push)
</source>

==cloning the remote==
To clone the remote git needs an authentication from its users, usually using '''ssh keys'''.

===authentication===
ssh key pairs (a public and private key) is an authentication method for clients to access servers through <code>ssh</code>. E.g. For my computer to ssh to pzwart1.

How do we go about doing that:
* in our local computers we need to [https://git-scm.com/book/en/v2/Git-on-the-Server-Generating-Your-SSH-Public-Key generate an ssh-key pair]
* in our local computer a plain text file <code>~/.ssh/id_rsa.pub</code> stores contains our ''public key''
* we give our public key to the git admin,
* the adim adds the ''public key'' to the git server's <code>/home/git/.ssh/authorized_keys</code>
* we are ready to clone, push and pull to the remote.

===clone===
<source lang="bash">
git clone git@pzwart1.wdka.hro.nl:/home/git/git/amazing_project.git
</source>

Git - Revision history

Andre: /* 3 Git moments */

Andre at 18:59, 6 February 2017

Andre at 18:20, 1 February 2017

Andre: Created page with "File:GitForArtists.jpg =resources= [http://ndpsoftware.com/git-cheatsheet.html#loc=index; Git Cheatsheet] [http://git-scm.com/ Git home] [https://wubthecaptain.eu/arti..."