GIT: what else?

Alexandru Simonescu http://alexsimo.com @alexsimonescu http://blog.alexsimo.com - Ray Bradbury hi@alexsimo.com

Concepts Some basic concepts. It won’t hurt, i promise.

work modes you don’t need to be connected to network
_offline first _no need of network _synchronize only when you want and what you want

Subversion?

Stages workspace staging area repository add commit working directory index
HEAD

workspace contains the files you are working on workspace working
directory

staging acts like intermediary zone staging area index

head node in git tree that points to last commit
repository HEAD

commit registers file snapshot in git graph git add <file>
git add --all git add *.java git commit -m “Commit message”

push send commits to remote repository git push origin master
git push origin develop

branch registers file snapshot in git graph git checkout -b
feature git branch -d feature git branch -v git branch -a

remote local repository can track more than one remote git
remote git remote -v git remote add origin <url>

stash registers file snapshot in git graph git stash git
stash list git stash apply stash@{0}

pull synchronizes and merges files from remote git pull origin
master

fetch updates your local remote- tracking branches (commits, branches and
tags) git fetch origin git fetch --all

merge merges given branch with actual; can produce conflicts $(develop)
git merge feature-oauth

diff useful to see differences between commits or branches git
diff <branch_a> <branch_b> git diff <commit_1> <commit_2>

tag associates tag to commit git tag v1.0 2b343csw2ff git
tag v1.0 <HEAD>

log displays last commits git log gitk

Commit message tips

message structure it should be like a tweet express more
in less type : subject body footer

choose right prefix be a good citizen motherfucker • feat:
a new feature • fix: a bug fix • docs: changes to documentation • style: formatting, missing semi colons, etc; no code change • refactor: refactoring production code • test: adding tests, refactoring test; no production code change • chore: updating build tasks, package manager configs, etc; no production code change

Workflow Daily basic workflow. You won’t need more.

1 work on your files 2 add edited files to
staging area 3 make a commit 4 push commits to remote server (optional) 5 pull remote files 6 work on your files upstream downstream

Workflow Pro workflow. How cool kids play. PROFESIONAL

Kata time

references stuff you should check http://udacity.github.io/git-styleguide/ http://rogerdudler.github.io/git-guide/index.es.html https://www.atlassian.com/git/ http://nvie.com/posts/a-successful-git-branching-model/

Thanks! Alexandru V. Simonescu hi@alexsimo.com

GIT: what else?

GIT: what else?

Alexandru Simonescu

More Decks by Alexandru Simonescu

Other Decks in Programming

Featured

Transcript

GIT

Alexandru Simonescu http://alexsimo.com @alexsimonescu http://blog.alexsimo.com - Ray Bradbury hi@alexsimo.com

Concepts Some basic concepts. It won’t hurt, i promise.

work modes you don’t need to be connected to network

Subversion?

Stages workspace staging area repository add commit working directory index

workspace contains the files you are working on workspace working

staging acts like intermediary zone staging area index

head node in git tree that points to last commit

commit registers file snapshot in git graph git add <file>

push send commits to remote repository git push origin master

branch registers file snapshot in git graph git checkout -b

remote local repository can track more than one remote git

stash registers file snapshot in git graph git stash git

pull synchronizes and merges files from remote git pull origin

fetch updates your local remote- tracking branches (commits, branches and

merge merges given branch with actual; can produce conflicts $(develop)

diff useful to see differences between commits or branches git

tag associates tag to commit git tag v1.0 2b343csw2ff git

log displays last commits git log gitk

Commit message tips

message structure it should be like a tweet express more

choose right prefix be a good citizen motherfucker • feat:

Workflow Daily basic workflow. You won’t need more.

1 work on your files 2 add edited files to

Workflow Pro workflow. How cool kids play. PROFESIONAL

Kata time

references stuff you should check http://udacity.github.io/git-styleguide/ http://rogerdudler.github.io/git-guide/index.es.html https://www.atlassian.com/git/ http://nvie.com/posts/a-successful-git-branching-model/

Thanks! Alexandru V. Simonescu hi@alexsimo.com