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
110
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
860
Serverless mobile applications with Firebase v2
alxsimo
4
250
Serverless mobile applications with Firebase
alxsimo
5
300
!Smelly code - The origins
alxsimo
0
92
Cleaner code with Guava v2
alxsimo
5
520
Cleaner code with Guava
alxsimo
3
150
Low fat backends for mobile guys
alxsimo
0
100
Other Decks in Programming
See All in Programming
オープンソースソフトウェアへの解像度🔬
utam0k
17
3.1k
なんでRustの環境構築してないのにRust製のツールが動くの? / Why Do Rust-Based Tools Run Without a Rust Environment?
ssssota
14
46k
CSC305 Lecture 10
javiergs
PRO
0
260
bootcamp2025_バックエンド研修_WebAPIサーバ作成.pdf
geniee_inc
0
130
iOSでSVG画像を扱う
kishikawakatsumi
0
170
kiroとCodexで最高のSpec駆動開発を!!数時間で web3ネイティブなミニゲームを作ってみたよ!
mashharuki
0
920
マンガアプリViewerの大画面対応を考える
kk__777
0
260
『毎日の移動』を支えるGoバックエンド内製開発
yutautsugi
2
290
他言語経験者が Golangci-lint を最初のコーディングメンターにした話 / How Golangci-lint Became My First Coding Mentor: A Story from a Polyglot Programmer
uma31
0
420
なぜGoのジェネリクスはこの形なのか? - Featherweight Goが明かす設計の核心
qualiarts
0
250
monorepo の Go テストをはやくした〜い!~最小の依存解決への道のり~ / faster-testing-of-monorepos
convto
2
550
Google Opalで使える37のライブラリ
mickey_kubo
3
150
Featured
See All Featured
Visualization
eitanlees
149
16k
Designing for humans not robots
tammielis
254
26k
A better future with KSS
kneath
239
18k
Six Lessons from altMBA
skipperchong
29
4k
Code Review Best Practice
trishagee
72
19k
Save Time (by Creating Custom Rails Generators)
garrettdimon
PRO
32
1.7k
Done Done
chrislema
185
16k
Intergalactic Javascript Robots from Outer Space
tanoku
272
27k
RailsConf 2023
tenderlove
30
1.3k
The Art of Delivering Value - GDevCon NA Keynote
reverentgeek
16
1.7k
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
soudai
PRO
190
55k
Faster Mobile Websites
deanohume
310
31k
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]