Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
GIT: what else?
Search
Alexandru Simonescu
January 29, 2016
Programming
1
100
GIT: what else?
Basic talk to GIT concepts and workflows.
Alexandru Simonescu
January 29, 2016
Tweet
Share
More Decks by Alexandru Simonescu
See All by Alexandru Simonescu
Software Architecture Journey
alxsimo
4
760
Serverless mobile applications with Firebase v2
alxsimo
4
250
Serverless mobile applications with Firebase
alxsimo
5
300
!Smelly code - The origins
alxsimo
0
87
Cleaner code with Guava v2
alxsimo
5
510
Cleaner code with Guava
alxsimo
3
140
Low fat backends for mobile guys
alxsimo
0
94
Other Decks in Programming
See All in Programming
ピラミッド、アイスクリームコーン、SMURF: 自動テストの最適バランスを求めて / Pyramid Ice-Cream-Cone and SMURF
twada
PRO
10
1.3k
subpath importsで始めるモック生活
10tera
0
310
どうして僕の作ったクラスが手続き型と言われなきゃいけないんですか
akikogoto
1
120
flutterkaigi_2024.pdf
kyoheig3
0
150
受け取る人から提供する人になるということ
little_rubyist
0
250
Amazon Qを使ってIaCを触ろう!
maruto
0
410
AI時代におけるSRE、 あるいはエンジニアの生存戦略
pyama86
6
1.2k
CSC509 Lecture 13
javiergs
PRO
0
110
Contemporary Test Cases
maaretp
0
140
Better Code Design in PHP
afilina
PRO
0
130
Macとオーディオ再生 2024/11/02
yusukeito
0
370
as(型アサーション)を書く前にできること
marokanatani
10
2.7k
Featured
See All Featured
"I'm Feeling Lucky" - Building Great Search Experiences for Today's Users (#IAC19)
danielanewman
226
22k
GraphQLとの向き合い方2022年版
quramy
43
13k
Visualization
eitanlees
145
15k
How To Stay Up To Date on Web Technology
chriscoyier
788
250k
Imperfection Machines: The Place of Print at Facebook
scottboms
265
13k
5 minutes of I Can Smell Your CMS
philhawksworth
202
19k
Designing on Purpose - Digital PM Summit 2013
jponch
115
7k
Building Your Own Lightsaber
phodgson
103
6.1k
Put a Button on it: Removing Barriers to Going Fast.
kastner
59
3.5k
Principles of Awesome APIs and How to Build Them.
keavy
126
17k
Build your cross-platform service in a week with App Engine
jlugia
229
18k
Rails Girls Zürich Keynote
gr2m
94
13k
Transcript
GIT
Alexandru Simonescu http://alexsimo.com @alexsimonescu http://blog.alexsimo.com - Ray Bradbury
[email protected]
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
None
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
[email protected]