Distributed Version Control System (DVCS)

Command Line Interface (CLI)

Many GUI tools available

Official Git site is https://git-scm.com

Learn git in 15 mins https://try.github.io/

Project based learning https://learn.wheelhouse.io/

Learn from Github expert https://services.github.com/

Git tutorial https://www.atlassian.com/git/

• Install git from https://git-scm.com/

• $ git help

• $ git config --global user.name "Ashish Pandey"

• $ git config --global user.email ashishapy@gmail.com

• $ git config --global color.ui true

$ git config --global alias.<alias-name> <git-command>

 $ git init

 $ git remote add origin https://github.com/ashishapy/git-scm-demo.git

 $ git clone https://github.com/ashishapy/git-scm-demo.git

OR

 $ git status

 $ git remote -v

~/.gitconfig

./.git/

 $ git add -A

 $ git commit -m "commit message"

 $ git push

 $ git pull

 $ git checkout

 $ git status

Add all .txt files in the whole directory

git reset HEAD <file>

Add list of files

Add all files

Add .txt of files from current directory

Add .txt of files from docs directory

Add all files from docs directory

Unstage file changes

Semantically related changes should not be split across commits

Changes in a commit should be semantically related

A commit should not introduce compilation errors

A commit should not break existing tests nor add a failing one

Commit should be ordered deliberately

Commits should show programmers's thought process

A commit message should include a short summary

A commit description can have longer description

$ git reset --soft HEAD^

$ git commit --amend -m "new commit message"

$ git reset --hard HEAD^

$ git reset --hard HEAD^^

Undo last commit, put changes into staging

Change the last commit

Undo last commit and all changes

Undo last 2 commits and all changes

After you Push

$ git rebase <base>

Move a branch to a new base commit

$ git log --oneline [-p] [--stat] [--graph] 

$ git log --pretty="%h %ad- %s [%an]"

$ git log --since=1.month.ago --until=2.weeks.ago

$ git log file

$ git diff

$ git diff --staged

$ git diff HEAD

$ git diff 4fb063d..56ght76

$ git diff master new_feature

$ git diff --since=1.month.ago --until=2.weeks.ago

$ git blame index.html --date short

diff between range of SHA

diff between last commit & current state

diff between two branches

time based diff

diff between last commit & staged changes

diff between staged changes & working copy

$ git checkout <commit> <file>

$ git checkout <commit>

$ git revert <commit>

$ git reset <file>

$ git reset

$ git reset --hard

$ git clean -n

$ git clean -f

$ git clean -df

$ git clean -xf

The git revert command undoes a committed snapshot.

Permanent undo

removes untracked files from your working directory

remove files from staging area

staging area & working directory

GitHub Enterprise

GitHub

On Cloud

On your server

Community

Enterprise

On Cloud

Setup on AWS

gitlab with docker

1. Centralised Workflow 

2. Features Branch Workflow 

3. Gitflow Workflow 

4. Forking Workflow 

Just guidelines, you can mix & match

$ git fetch <remote>

$ git fetch <remote> <branch>

$ git pull <remote>

$ git push <remote> <branch>

$ git push <remote> --all

$ git push <remote> --tags

$ git tag

$ git tag -a v0.0.3 -m "release version 0.0.3"

$ git push --tags

$ git checkout v0.0.3

list all tags

add a new tag

push the tag

checkout code at commit

Need to work on a feature that will take some time?

Time to branch out.

$ git checkout -b new_branch

$ git checkout master

$ git merge new_branch 

$ git branch -d new_branch 

1.

$ git branch meetup_attendance

$ git checkout meetup_attendance

$ git branch

$ git push origin meetup_attendance

OR $ git checkout -b meetup_attendance

2.

# Create a remote branch on Remote Server

$ git pull

$ git branch -r

$ git checkout online_attendance

$ git branch

$ git remote show origin

$ git push origin :meetup_attendance

$ git branch -d meetup_attendance

$ git branch -D meetup_attendance

$ git remote prune origin

delete remote branch

delete local branch

clean up deleted remote branches

forcefully delete local branch

Extra merge commits are bad

Extra merge commits are bad

1. Move all changes to master which are not in origin/master to a temporary area.
2. Run all origin/master commits.
3. Run all commits in the temporary are, one at a time.
4.  (no merge commits)

The golden rule of git rebase  is to never use it on public  branches.

$ git stash

$ git stash pop

$ git stash list

$ git stash drop

Temporary stores all modified tracked files

Restores the most recently stashed files

List all stashed changesets

Discard the most recently stashed changesets

JIRA

Confluence

Slack

Automated build & Continuous Integration

Waffle

$ git clone --depth 1 <repo_url>