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 scm in one hour
Search
Grzegorz Wilczyński
February 05, 2014
Programming
0
110
git scm in one hour
basics of git
Grzegorz Wilczyński
February 05, 2014
Tweet
Share
More Decks by Grzegorz Wilczyński
See All by Grzegorz Wilczyński
REWRITE'EM ALL
gwilczynski
2
470
Chain made out of coins - smart introduction to blockchain
gwilczynski
0
100
WebComponents or shadow side of the Doom
gwilczynski
0
49
clean code
gwilczynski
0
130
Single responsibility principle
gwilczynski
2
190
Productivity for Programmers
gwilczynski
3
200
Git branching model for TAPTeam
gwilczynski
0
920
JS design patterns
gwilczynski
6
370
Other Decks in Programming
See All in Programming
20251016_Rails News ~Rails 8.1の足音を聴く~
morimorihoge
2
500
The Past, Present, and Future of Enterprise Java
ivargrimstad
0
430
Pull-Requestの内容を1クリックで動作確認可能にするワークフロー
natmark
2
520
詳しくない分野でのVibe Codingで困ったことと学び/vibe-coding-in-unfamiliar-area
shibayu36
3
5.1k
株式会社 Sun terras カンパニーデック
sunterras
0
360
技術的負債の正体を知って向き合う
irof
0
190
なぜGoのジェネリクスはこの形なのか? Featherweight Goが明かす設計の核心
ryotaros
7
1.1k
CSC305 Lecture 08
javiergs
PRO
0
230
スキーマ駆動で、Zod OpenAPI Honoによる、API開発するために、Hono Takibiというライブラリを作っている
nakita628
0
180
私達はmodernize packageに夢を見るか feat. go/analysis, go/ast / Go Conference 2025
kaorumuta
2
600
iOSエンジニア向けの英語学習アプリを作る!
yukawashouhei
0
200
あなたとKaigi on Rails / Kaigi on Rails + You
shimoju
0
170
Featured
See All Featured
[Rails World 2023 - Day 1 Closing Keynote] - The Magic of Rails
eileencodes
37
2.6k
Evolution of real-time – Irina Nazarova, EuRuKo, 2024
irinanazarova
9
980
Six Lessons from altMBA
skipperchong
29
4k
Dealing with People You Can't Stand - Big Design 2015
cassininazir
367
27k
ピンチをチャンスに:未来をつくるプロダクトロードマップ #pmconf2020
aki_iinuma
127
54k
CSS Pre-Processors: Stylus, Less & Sass
bermonpainter
359
30k
Done Done
chrislema
185
16k
Site-Speed That Sticks
csswizardry
13
910
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
marktimemedia
31
2.5k
The Language of Interfaces
destraynor
162
25k
Optimising Largest Contentful Paint
csswizardry
37
3.5k
The Myth of the Modular Monolith - Day 2 Keynote - Rails World 2024
eileencodes
26
3.1k
Transcript
GIT SCM IN ONE HOUR Grzegorz Wilczyński" twitter.com/wilq_
SCM http://sodiumlightsthehorizon.co.uk/cms/wp-content/uploads/2010/09/13357-ba33a2-500-407.jpg
SVN Server Client 1 Client 2 Client 3
GIT Client 1 Client 2 Client 3
Setup ❖ git config --global user.name "Your Name"" ❖ git
config --global user.email "
[email protected]
"" ❖ Unix users:! ❖ git config --global core.autocrlf input" ❖ git config --global core.safecrlf true" ❖ Windows users:! ❖ git config --global core.autocrlf true" ❖ git config --global core.safecrlf true
Practice ❖ git clone
[email protected]
:gwilczynski/git-scm-in-one-hour.git" ❖ git status" ❖ vim
cupcake.txt" ❖ git add --all" ❖ git commit -m "added cupcake"" ❖ git push
Practice ❖ git log! ! ❖ commit 8e222b5bd022d0250795472f8ee9a415b74b87d0" ❖ Author:
Grzegorz Wilczynski <
[email protected]
>" ❖ Date: Tue Feb 4 22:43:06 2014 +0100" ❖ added cupcake" ! ❖ commit 6eb8670d1a6b877f7318a7389e79475617c05aea" ❖ Author: Grzegorz Wilczyński <
[email protected]
>" ❖ Date: Tue Feb 4 12:53:28 2014 -0800" ❖ Initial commit
Practice ❖ git checkout -b pink-team" ❖ git push origin
pink-team" ❖ git checkout -b pink-team origin/pink-team -t" ❖ git merge pink-team
Practice ❖ Auto-merging cupcake.txt" ❖ CONFLICT (content): Merge conflict in
cupcake.txt" ❖ Automatic merge failed; fix conflicts and then commit the result.
Practice ❖ <<<<<<< HEAD" ❖ Cupcake test dolor " ❖
=======" ❖ Rose ipsum dolor " ❖ >>>>>>> pink-team
Practice ❖ git checkout 8e222b5bd022d0250795472f8ee9a415b74b87d0
Sources ❖ http://gitimmersion.com/" ❖ http://git-scm.com/