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
社内フレームワークとその依存性解決 / in-house framework and its dependency management
vvakame
1
550
法律の脱レガシーに学ぶフロントエンド刷新
oguemon
5
730
ISUCON14公式反省会LT: 社内ISUCONの話
astj
PRO
0
180
Amazon Q Developer Proで効率化するAPI開発入門
seike460
PRO
0
110
Compose でデザインと実装の差異を減らすための取り組み
oidy
1
300
SwiftUI Viewの責務分離
elmetal
PRO
0
140
テストをしないQAエンジニアは何をしているか?
nealle
0
130
AIの力でお手軽Chrome拡張機能作り
taiseiue
0
170
“あなた” の開発を支援する AI エージェント Bedrock Engineer / introducing-bedrock-engineer
gawa
11
1.8k
『GO』アプリ バックエンドサーバのコスト削減
mot_techtalk
0
130
Immutable ActiveRecord
megane42
0
130
動作確認やテストで漏れがちな観点3選
starfish719
6
1k
Featured
See All Featured
jQuery: Nuts, Bolts and Bling
dougneiner
63
7.6k
The World Runs on Bad Software
bkeepers
PRO
67
11k
RailsConf 2023
tenderlove
29
1k
Building Adaptive Systems
keathley
40
2.4k
Building a Scalable Design System with Sketch
lauravandoore
460
33k
The Art of Delivering Value - GDevCon NA Keynote
reverentgeek
10
1.3k
The Myth of the Modular Monolith - Day 2 Keynote - Rails World 2024
eileencodes
20
2.4k
Scaling GitHub
holman
459
140k
CSS Pre-Processors: Stylus, Less & Sass
bermonpainter
356
29k
Making Projects Easy
brettharned
116
6k
Understanding Cognitive Biases in Performance Measurement
bluesmoon
27
1.5k
Exploring the Power of Turbo Streams & Action Cable | RailsConf2023
kevinliebholz
29
4.6k
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]