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
800
Serverless mobile applications with Firebase v2
alxsimo
4
250
Serverless mobile applications with Firebase
alxsimo
5
300
!Smelly code - The origins
alxsimo
0
89
Cleaner code with Guava v2
alxsimo
5
510
Cleaner code with Guava
alxsimo
3
140
Low fat backends for mobile guys
alxsimo
0
96
Other Decks in Programming
See All in Programming
法律の脱レガシーに学ぶフロントエンド刷新
oguemon
5
730
TokyoR116_BeginnersSession1_環境構築
kotatyamtema
0
110
第3回関東Kaggler会_AtCoderはKaggleの役に立つ
chettub
3
890
Amazon Bedrock Multi Agentsを試してきた
tm2
1
280
『GO』アプリ データ基盤のログ収集システムコスト削減
mot_techtalk
0
110
JavaScriptツール群「UnJS」を5分で一気に駆け巡る!
k1tikurisu
10
1.8k
Spring gRPC について / About Spring gRPC
mackey0225
0
220
Honoとフロントエンドの 型安全性について
yodaka
4
250
データの整合性を保つ非同期処理アーキテクチャパターン / Async Architecture Patterns
mokuo
41
15k
さいきょうのレイヤードアーキテクチャについて考えてみた
yahiru
3
730
Honoのおもしろいミドルウェアをみてみよう
yusukebe
1
200
Amazon ECS とマイクロサービスから考えるシステム構成
hiyanger
2
490
Featured
See All Featured
Evolution of real-time – Irina Nazarova, EuRuKo, 2024
irinanazarova
6
540
The World Runs on Bad Software
bkeepers
PRO
67
11k
Become a Pro
speakerdeck
PRO
26
5.1k
Refactoring Trust on Your Teams (GOTO; Chicago 2020)
rmw
33
2.8k
Documentation Writing (for coders)
carmenintech
67
4.6k
Code Reviewing Like a Champion
maltzj
521
39k
Sharpening the Axe: The Primacy of Toolmaking
bcantrill
40
2k
Distributed Sagas: A Protocol for Coordinating Microservices
caitiem20
330
21k
Unsuck your backbone
ammeep
669
57k
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
stephaniewalter
280
13k
Design and Strategy: How to Deal with People Who Don’t "Get" Design
morganepeng
129
19k
Building Flexible Design Systems
yeseniaperezcruz
328
38k
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]