�ݺ�ߣ

Improving your
work?ow with GIT

What it is GIT?
Open Source
Distributed
Version Control System

What it is GIT?
Open Source Distributed Version Control System

Understanding GIT
Internet
Your local machinegit push
git pull /
git clone /
git fetch
git add
git commit

Don��t be afraid of the GIT
command line
GIT commands

Know what you are doing
git init
git clone /path/to/repository.git
Get and exact copy of the given remote repository into your local machine
Create a new repository

git status
Display current status of the working directory
View current branch name
Check for pending changes
Show staged, unstaged and untracked ?les

git add Add ?les to the index
git add . # Add all the modified fields to the index
git add filename # Add specific file to the index
git commit Con?rm & save added ?les to your local repository
git commit -m ��message description�� # Write a message in the history and
# save previously added files

git branch List, create or delete branches
git branch # List local branches
git branch -l # List local branches
git branch -r # List remote branches
git branch branchname # Create a branch with branchname
git branch -d branchname # Delete branchname

git merge
Join changes from speci?c branch to the
current branch
git merge branch-name
git merge --no-ff branch-name
Using No Fast Forward option helps to have a tidy
git history

git checkout Switch branches or restore working tree
git checkout branch-name # Switch to the given branch name (if exist)
git checkout -b branch-name # Create a branch-name and switch to it
git checkout . # Replace all local changes
git checkout filename # Replace filename changes

git push Update remote references with your local
git push origin branch-name
git pull Fetch changes from another branch and merge
into the current branch
git pull origin branch-name
git fetch

git log
View repository history
git log --oneline
git log -all --decorate --oneline --graph

git stash
git stash pop
git stash drop
git stash list
git stash apply stash@{N}
Quick save of current changes
Restore recent saved changes
List all staged work
Remove staged work
Restore specific staged work

Tortoise GIT
Only Windows
Easy to install and use
Log and Search history
Windows integration

Sourcetree
Windows and Mac
Easy to install and use
Built-in code editor
Bitbucket & Jira integration

Git Kraken
Windows, Mac, Linux
Visual history
Merge con?icts
Built-in code editor
Growing community
Integrations with GitLab, GitHub, Bitbucket

Feature
branches
Solo
work?ow
Git?ow Forking
work?ow

Solo work?ow
�� Single branch
�� Simplicity
�� Small teams *
�� Entry stage for developers
�� Zero e?ort

Feature branches
�� Work on separate functionalities
�� Pull/merge requests (code review)
�� Multiple developers

Git?ow
Git work?ow and extension proposed by
Vincent Driessen
�� Development branch
�� Feature branches
�� Hot?x branches
�� Release branches
�� Custom commands

Git?ow
O?li, C., & O?li, C. (2018, April 09). Git?ow Work?ow, Automated Builds, Integration & Deployment. Retrieved April 20, 2019, from
https://medium.com/devsondevs/git?ow-work?ow-continuous-integration-continuous-delivery-7f4643abb64f
or Metro map?

Git?ow
Git ?ow commands to deal with it

Git?ow vs GIT raw commands
Create a new feature branch
git flow init BRANCHNAME git checkout -b feature/BRANCHNAME
Publish feature branch
git flow feature publish BRANCHNAME git checkout feature/BRANCHNAME
git push origin feature/BRANCHNAME
Finish feature
git flow feature finish MYFEATURE git checkout develop
git merge --no-ff feature/BRANCHNAME
git branch -d feature/BRANCHNAME

Git?ow vs GIT raw commands
New release
git flow release start 1.0 git checkout -b release/1.0 develop
Finish release
git flow release finish 1.0 git checkout master
git merge --no-ff release/1.0
git tag -a 1.0
git checkout develop
git merge --no-ff release/1.0
git branch -d release/1.0

Forking work?ow
�� Server side repository for each developer
�� Public repositories
�� Only maintainer can accept changes
�� Pull/merge requests (code review)

YOUR GIT
WORKFLOW
create & adapt
to your needs

Improving your workflow with git

GitLab. (2018). Retrieved from https://about.gitlab.com/images/press/git-cheat-sheet.pdf
Git. (n.d.). Git. Retrieved from https://git-scm.com/
References & Takeaways
Dudler, R. (2012, January 11). Git cheat sheet. Retrieved from https://rogerdudler.github.io/git-guide/?les/git_cheat_sheet.pdf
Marklodato.github.io. (2019). A Visual Git Reference. [online] Available at: https://marklodato.github.io/visual-git-guide/index-en.html
[Accessed 10 Mar. 2019].
Cottle, P. (2019). Learn Git Branching. [online] Learngitbranching.js.org. Available at: https://learngitbranching.js.org/ [Accessed 09 Mar.
2019].
Roa, H. (2017, August 23). hendrixroa/in-case-of-?re. Retrieved from https://github.com/hendrixroa/in-case-of-?re
Wehner, J. (2019). How to undo (almost) anything with Git - The GitHub Blog. [online] The GitHub Blog. Available at:
https://github.blog/2015-06-08-how-to-undo-almost-anything-with-git/ [Accessed 15 Mar. 2019].
Driessen, V. (2010, January 05). A successful Git branching model. Retrieved March 20, 2019, from
https://nvie.com/posts/a-successful-git-branching-model/

�ݺ�ߣ

Improving your workflow with git

Recommended

More Related Content

What's hot (20)

Similar to Improving your workflow with git (20)

Recently uploaded (20)

Improving your workflow with git