gitlab training with git and sourcetree

Gitlab Training

Teerapat Khunpech

VCS Technology

True Information Technology

Gitlab : New Project

Gitlab : New Project (cont.)

Use SSH Key

SSH keys

SSH keys are a way to identify trusted

computers, without involving passwords. The

steps below will walk you through generating an

SSH key and adding the public key to your Gitlab

account.

6http://docstore.mik.ua/orelly/networking_2ndEd/ssh/figs/ssh_0202.gif

SSH-Keygen

$ ssh-keygen –t rsa –C “teerapat_khu@truecorp.co.th”Generate public/private rsa key pair.

Enter file in which to save the key

/home/teerapat_khu/.ssh/id_rsa: [Press enter]

Enter passphrase (empty no passphrase): [Type a passphrase]

Enter same passphrase again: [Type passphrase again]

Your identification has been saved in /home/teerapat_khu/.ssh/ida_rsa.

Your public key has been saved in /home/teerapat_khu/.ssh/ida_rsa.pub.

The key fingerprint is:

bd:10:cf:76:23:4c:c7:34:83:26:ba:f4:c3:31:c1:00 teerapat_khu@truecorp.co.th

SSH-Keygen

$ cat /home/teerapat_khu/.ssh/ida_rsa.pubssh-rsa

AAAAB3NzaC1yc2EAAAADAQABAAABAQDJjw9w7vbV3bQZ9kWBCBTVK2vYIMX+k6Zo6hf/MDVE2dttCdQJ87+dDdO

jRfudizsjge0nLb/pFfWtyTbZu9NGLPo/PRYD9PAPOoU6Bp9fhOCjV4ShZQQcEnZ+iIsmGAoCR08JAW/kVsu55U

8EHxuCv7Tq0L3LhUPqfbmbCO2bZP11d5kAREd4kJxA7o5SO5e2VtDJurf5COjmGXRl31AuafeXLZdtWzdSOuy5/

Lw5k+X2LnKohZYupzZ3I7O+K1x2MOuXMXgg/ZdOyyrkaMGC78s6EFhVGoTfZUU/lH8TE6v2BL0RSqbD4Ty5YZ81

+ZMezUvuyTlY7OdA6Jda/hPd teerapat_khu@truecorp.co.th

SSH-Keygen

$ cat /home/teerapat_khu/.ssh/ida_rsa.pubssh-rsa

AAAAB3NzaC1yc2EAAAADAQABAAABAQDJjw9w7vbV3bQZ9kWBCBTVK2vYIMX+k6Zo6hf/MDVE2dttCdQJ87+dDdO

jRfudizsjge0nLb/pFfWtyTbZu9NGLPo/PRYD9PAPOoU6Bp9fhOCjV4ShZQQcEnZ+iIsmGAoCR08JAW/kVsu55U

8EHxuCv7Tq0L3LhUPqfbmbCO2bZP11d5kAREd4kJxA7o5SO5e2VtDJurf5COjmGXRl31AuafeXLZdtWzdSOuy5/

Lw5k+X2LnKohZYupzZ3I7O+K1x2MOuXMXgg/ZdOyyrkaMGC78s6EFhVGoTfZUU/lH8TE6v2BL0RSqbD4Ty5YZ81

+ZMezUvuyTlY7OdA6Jda/hPd teerapat_khu@truecorp.co.th

Copy this

Add key to SSH Agent

$ eval `ssh-agent -s`

Agent pid 7260

Add key to SSH Agent

$ eval `ssh-agent -s`

Agent pid 7260

$ ssh-add /home/teerapat_khu/.ssh/ida_rsa.pub

Enter passphrase for ssh-add /home/teerapat_khu/.ssh/ida_rsa.pub:

PuTTY Key Generator

• On windows use Putty Key generator

PuTTY Key Generator

• On windows use Putty Key generator

Copy this

Save to file

Add SSH Key to SourceTree

Add SSH Key to Gitlab

Profile Settings > SSH Keys

Add SSH Key to Gitlab (cont.)

Profile Settings > SSH Keys > Add SSH Key

SourceTree: Create New Repository

Git: Create New Repository

$ git initInitialized empty Git repository in

/home/teerapat_khu/mywebapp/.git/

SourceTree: Clone Gitlab Project

Git: Clone Gitlab Project

$ git clone git@gitlab.vcs.true.th:Teera36/my-

webapp.git

Cloning into 'my-webapp'...

warning: You appear to have cloned an empty repository.

Checking connectivity... done.

SourceTree: Add Remote Repository

(cont.)

Git: Add Remote Repository

$ git remote add gitlab-vcs \

git@gitlab.vcs.true.th:Teera36/my-

webapp.git

SourceTree: Make some change

SourceTree: Add file to staged

Git: Add file to staged

$ git add .

SourceTree: Commit

Git: Commit

$ git commit –m “First commit”[develop a75c276] First commit

18 files changed, 724 insertions(+)

create mode 100755 .bowerrc

create mode 100755 .editorconfig

create mode 100755 .gitattributes

create mode 100755 .gitignore

create mode 100755 .jshintrc

create mode 100755 .yo-rc.json

create mode 100755 Gruntfile.js

create mode 100755 app/favicon.ico

create mode 100755 app/index.html

create mode 100755 app/robots.txt

create mode 100755 app/scripts/main.js

create mode 100755 app/styles/main.css

create mode 100755 bower.json

create mode 100755 package.json

create mode 100755 test/.bowerrc

create mode 100755 test/bower.json

create mode 100755 test/index.html

create mode 100755 test/spec/test.js

SourceTree: Log/History

Git: Log/History

$ git logcommit a75c2764c720fd4fccab54d8ef1e8a7bb6244060

Author: teerapat_khu <teerapat_khu@truecorp.co.th>

Date: Thu Jun 11 19:02:27 2015 +0700

First commit

SourceTree: Push to Remote Repo

Git: Push to Remote Repo

$ git push –u gitlab-vcs masterCounting objects: 2, done.

Writing objects: 100% (2/2), 161 bytes | 0 bytes/s, done.

Total 2 (delta 0), reused 0 (delta 0)

To git@gitlab.vcs.true.th:Teera36/my-webapp.git

* [new branch] master -> master

Branch master set up to track remote branch master from gitlab-

Git: Log/History

$ git logcommit a75c2764c720fd4fccab54d8ef1e8a7bb6244060

Author: teerapat_khu <teerapat_khu@truecorp.co.th>

Date: Thu Jun 11 19:02:27 2015 +0700

First commit

SourceTree: Git Flow initial

Git: Git Flow initial

$ git flow initNo branches exist yet. Base branches must be created now.

Branch name for production releases: [master]

Branch name for "next release" development: [develop]

How to name your supporting branch prefixes?

Feature branches? [feature/]

Release branches? [release/]

Hotfix branches? [hotfix/]

Support branches? [support/]

Version tag prefix? []

SouceTree: Log/History

Git: Log/History

$ git branch

* develop

master

SourceTree: Start new feature

SourceTree: Start new feature (cont.)

Git: Start new feature

$ git flow feature start Create_Index_PageSwitched to a new branch 'feature/Create_Index_Page'

Summary of actions:

- A new branch 'feature/Create_Index_Page' was created, based on

'develop'

- You are now on branch 'feature/Create_Index_Page'

Now, start committing on your feature. When done, use:

git flow feature finish Create_Index_Page

Git: Log/History

$ git branchdevelop

* feature/Create_Index_Page

master

SourceTree: New Feature (add)

Git: New Feature (add)

$ vi app/index.html

$ git statusOn branch feature/Create_Index_Page

Changes not staged for commit:

(use "git add <file>..." to update what will be committed)

(use "git checkout -- <file>..." to discard changes in working

directory)

modified: app/index.html

no changes added to commit (use "git add" and/or "git commit -a")

SourceTree: New Feature (add)

Git: New Feature (add)

$ git add .

SourceTree: New Feature (commit)

Git: New Feature (commit)

$ git commit -m "edit for include css bower

file"[feature/Create_Index_Page 4121469] edit for include

css bower file

1 file changed, 1 insertion(+), 1 deletion(-)

SourceTree: New Feature (log)

Git: New Feature (log)

$ git branch

develop

* feature/Create_Index_Page

master

$ git log --graph --pretty=oneline --abbrev-commit* 4121469 edit for include css bower file

* a75c276 First commit

SourceTree: Finish Feature

Git: Finish Feature

$ git flow feature finish Create_Index_Page

Switched to branch 'develop'

Updating a75c276..4121469

Fast-forward

app/index.html | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

Deleted branch feature/Create_Index_Page (was 4121469).

Summary of actions:

- The feature branch 'feature/Create_Index_Page' was

merged into 'develop'

- Feature branch 'feature/Create_Index_Page' has been

removed

- You are now on branch 'develop'

Git: Log/History

$ git branch

* develop

master

SourceTree: Start New Release

Git: Start New Release

$ git flow release start MyWebApp-1.0-unstableSwitched to a new branch 'release/MyWebApp-1.0-unstable'

Summary of actions:- A new branch 'release/MyWebApp-1.0-unstable' was created, based on 'develop'- You are now on branch 'release/MyWebApp-1.0-unstable'

Follow-up actions:- Bump the version number now!- Start committing last-minute fixes in preparing your release- When done, run:

git flow release finish 'MyWebApp-1.0-unstable'

Git: Log/History

$ git branch

develop

master

* release/MyWebApp-1.0-unstable

SourceTree: Finish Release

SourceTree: Finish Release and add Tag

Git: Finish Release

$ git flow release finish MyWebApp-1.0-unstableSwitched to branch 'master'

Your branch is up-to-date with 'gitlab-vcs/master'.

Merge made by the 'recursive' strategy.

.bowerrc | 3 ++

.editorconfig | 21 +++++++++

.gitattributes | 1 +

Deleted branch release/MyWebApp-1.0-unstable (was

4121469).

Summary of actions:

- Latest objects have been fetched from 'origin'

- Release branch has been merged into 'master'

- The release was tagged 'MyWebApp-1.0-unstable'

- Release branch has been back-merged into 'develop'

- Release branch 'release/MyWebApp-1.0-unstable' has been

deleted

Git: Log/History

$ git branch

develop

* master

$ git log --graph --pretty=oneline --abbrev-commit* 8811504 Merge branch 'release/MyWebApp-1.0-unstable'

| * 4121469 edit for include css bower file

Gitlab: View Branch

Gitlab: Create New Branch

SourceTree: Fetch From Remote Repo

Git: Fetch From Remote Repo

$ git fetch gitlab-vcs

From gitlab.vcs.true.th:Teera36/my-webapp

* [new branch] develop -> gitlab-vcs/develop

$ git push -u gitlab-vcs develop

b28c91b..4121469 develop -> develop

Branch develop set up to track remote branch develop from

gitlab-vcs.

Make some changes

Git: Log/History

$ git checkout developSwitched to branch 'develop'

Your branch is up-to-date with 'gitlab-vcs/develop'.

$ vim app/index.html

$ git add .

$ git commit -m "Add \"Sign up\" Menu"[develop 13c959a] Add "Sign up" Menu

1 file changed, 1 insertion(+)

$ git log --graph --pretty=oneline --abbrev-commit* 13c959a Add "Sign up" Menu

* 4121469 edit for include css bower file

SourceTree: Add Commit on Develop

Git: Add Commit on Develop

$ vim app/index.html

$ git add .

$ git commit -m “Fix css"[develop 1c8980f] Fix css

1 file changed, 1 insertion(+)

$ git log --graph --pretty=oneline --abbrev-commit* 1c8980f Fix css

* 13c959a Add "Sign up" Menu

* 4121469 edit for include css bower file

SourceTree: Start New Release

Git: Start New Release

$ git flow release start MyWebApp-1.1-unstableSwitched to a new branch 'release/MyWebApp-1.1-unstable'

Summary of actions:

- A new branch 'release/MyWebApp-1.1-unstable' was

created, based on 'develop'

- You are now on branch 'release/MyWebApp-1.1-unstable'

Follow-up actions:

- Bump the version number now!

- Start committing last-minute fixes in preparing your

release

- When done, run:

git flow release finish 'MyWebApp-1.1-unstable'

Git Log/History

$ git branchdevelop

master

* release/MyWebApp-1.1-unstable

Git: Finish Release

$ git flow release finish MyWebApp-1.1-unstableSwitched to branch 'master'

Your branch is up-to-date with 'gitlab-vcs/master'.

Merge made by the 'recursive' strategy.

app/index.html | 2 ++

1 file changed, 2 insertions(+)

Deleted branch release/MyWebApp-1.1-unstable (was

1c8980f).

Summary of actions:

- Latest objects have been fetched from 'origin'

- Release branch has been merged into 'master'

- The release was tagged 'MyWebApp-1.1-unstable'

- Release branch has been back-merged into 'develop'

- Release branch 'release/MyWebApp-1.1-unstable' has been

deleted

Git: Log/History

$ git branchdevelop

* master

$ git log --graph --pretty=oneline --abbrev-commit* e7fe2e7 Merge branch 'release/MyWebApp-1.1-unstable'

| * 1c8980f Fix css

| * 13c959a Add "Sign up" Menu

* | 8811504 Merge branch 'release/MyWebApp-1.0-unstable'

| * 4121469 edit for include css bower file

$ git push -u gitlab-vcs developCounting objects: 8, done.

Delta compression using up to 4 threads.

Compressing objects: 100% (8/8), done.

Writing objects: 100% (8/8), 701 bytes | 0 bytes/s, done.

4121469..1c8980f develop -> develop

Branch develop set up to track remote branch develop from

gitlab-vcs.

Gitlab: Merge Request

Gitlab: Merge Request (code review)

(Accept request)

Gitlab: History/Log

Make some changes

Gitlab: History/Log

gitlab training with git and sourcetree

Engineering

intro to git and sourcetree - teleyah · git is a source...

intro to git and sourcetree - teleyah...

gitlab cipipeline gitlab ci 6. ci/cd mkdocs pipeline gitlab...

gitlab workflow

gitflow, sourcetree and gitlab

zeger-jan van de weg starting with git and gitlab · lets...

su development forum · 1.create a git repo on gitlab 2.add...

learn git with gitlab - devopsschool git with gitlab.pdf ·...

git fundamentals course syllabus - devopsgroup academy ·...

puppet, gitlab, and r10kscottn/puppet_gitlab_r10k.pdf ·...

git Методологии разработки...

intermediary git · do not confuse with project management...

git and gitlab

mesosphere and gitlab:

prezentace aplikace powerpoint -...

advanced git and gitlab - nersc · pdf fileadvanced git and...

introduction à git (et gitlab) - github pages · 4...

one year with gitlab - sambaxp · 2018: gitlab ci...

project guidelines contents · 7.2 gitlab web interface and...

use case for gitlab - using gitlab for r program...