Git for Visual Studio Developers

De dotNed - Pluralsight Studiegroep

Agenda

Wednesday, February 3rd - 19:00Course Introduction

Git vs Centralized Version Control

Wednesday, February 10th - 19:00Working With Visual Studio

Wednesday, February 17th - 19:00TFS 2013

Wednesday, February 24th - 19:00Pull Requests

CodeLens

Wednesday, February 2nd - 19:00Advanced Git

Agenda Today

Introductions

Course Introduction

Git vs Centralized Version Control

Let’s practice Git

Feedback BoardWIFI: Delta-N guestww: laanvanwaalhaven450

About Mark van den Berg

markberg.wordpress.com

@markvandenberg

markvdb@delta-n.nl

16 years in business

ALM Consultant with developer background

TFS Specialist

Scrum Master

C#/.NET developer

Scrum/Kanban, ALM

Git 2,5 years

Who are you?

Please introduce yourselfOrganization

Role

Experience with Git

7

Feedback Board

Discuss remarks

Let’s practice

Install Git and tools

Git: https://git-scm.com/downloads

GUI’s https://git-scm.com/downloads/guisSourceTree

Git Extensions

SmartGit

Merge/Diff ToolsKDiff3 http://kdiff3.sourceforge.net

P4Merge https://www.perforce.com/downloads

>git help <command>

Setting up Git

Config in 3 locations<repo>/.git/config

~/.gitconfig (Users\<user>\.gitconfig) --global

<git install>/etc/gitconfig

>git config>git config --global user.name <name>

>git config --global user.email <email>

>git config --global core.editor notepad++

git config --global --edit

Setting up a repository

>git init>git init <directory>

>git init --bare <directory>

>git clone <repo>>git clone <repo> <directory>

>git clone https://github.com/markvandenberg/gittutorial.git

>git remote [-v]>git remote add <name> <url>

>git remote rm <name>

>git remote rename <old-name> <new-name>

Saving Changes

>git add>git add <file>

>git add <directory>

>git add .

>git commit> git commit

>git commit -m "<message>“

>git commit --amend

Inspecting a Repository

>git status

>git log>git log -n <limit>

>git log –oneline

>git log –stat

>git reflog

>git checkout>git checkout master

>git checkout <commit> <file>

>git checkout <commit> (commit hash or tag)

Undoing Changes

>git checkout>git checkout master

>git revert <commit>

>git reset <file> >git reset [--hard]

>git reset [--hard] <commit>

>git clean >git clean –n

>git clean -f

Using Branches

>git branch

>git branch <branch>

>git branch -d <branch>

>git checkout -b <new-branch>

>git merge <branch>git merge --no-ff <branch>

Syncing

>git fetch<remote>

>git fetch <remote> <branch>

>git pull <remote>>git pull --rebase <remote>

>git push <remote> <branch>>git push <remote> --force

>git push <remote> --all

>git push <remote> --tags

Rewriting history

>git commit --amend

>git rebase <base>

>git rebase -i <base>

Links

https://app.pluralsight.com/library/courses/git-visual-studio-developers/table-of-contents

https://training.github.com/kit/downloads/github-git-cheat-sheet.pdf

https://www.atlassian.com/git/tutorials/

https://msdn.microsoft.com/Library/vs/alm/Code/git/

See you next time!

Wednesday, February 10th - 19:00

Thank you!

About Delta-NMicrosoft Cloud Partner

Delta-N BV Volg ons:

Laan van Waalhaven 450 Twitter: https://twitter.com/DeltaNBV

2497 GR Den Haag Facebook: www.facebook.com/pages/Delta-N-BV

085 – 487 52 00 Blogs: www.delta-n.nl/blogs-medewerkers

info@delta-n.nl Linkedin: www.linkedin.com/company/delta-n

www.delta-n.nl Slideshare: www.slideshare.net/deltanbv