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
EKON 17: Git
Search
Sebastian Gingter
November 05, 2013
Programming
0
110
EKON 17: Git
My slides for the EKON 17 / 2013 talk about Git.
Sebastian Gingter
November 05, 2013
Tweet
Share
More Decks by Sebastian Gingter
See All by Sebastian Gingter
BASTA! Spring 2025 - Halluzinationen, Prompt Injections & Co.
phoenixhawk
0
39
SEACON 2024 - Talk to your Data
phoenixhawk
0
67
MLCon 2024 - Bootcamp: Conquer and Rule Generative AI
phoenixhawk
0
83
InfoDays Generative AI für Developer 2024
phoenixhawk
0
54
EKON 2024 - Prompt Injections, Halluzinationen und Co.
phoenixhawk
0
40
EKON 2024: Real World RAG mit eigenen Daten und Dokumenten
phoenixhawk
0
84
Gen AI Engineering Days - Prompt Injections, Hallucinations and More
phoenixhawk
0
87
Gen AI Engineering Days - Talk to your Data
phoenixhawk
0
66
"Talk to your data": Improving RAG solutions based on real-world experiences
phoenixhawk
0
31
Other Decks in Programming
See All in Programming
複数ドメインに散らばってしまった画像…! 運用中のPHPアプリに後からCDNを導入する…!
suguruooki
0
350
php-fpm がリクエスト処理する仕組みを追う / Tracing-How-php-fpm-Handles-Requests
shin1x1
4
470
SLI/SLOの設定を進めるその前に アラート品質の改善に取り組んだ話
tanden
2
410
AHC 044 混合整数計画ソルバー解法
kiri8128
0
260
NestJSのコードからOpenAPIを自動生成する際の最適解を探す
astatsuya
0
100
読もう! Android build ドキュメント
andpad
1
190
CSC486 Lecture 14
javiergs
PRO
0
140
Go1.24で testing.B.Loopが爆誕
kuro_kurorrr
0
130
PromptyによるAI開発入門
ymd65536
1
330
‘무차별 LGTM~👍’만 외치던 우리가 ‘고봉밥 코드 리뷰’를?
hannah0731
0
480
Goで作るChrome Extensions / Fukuoka.go #21
n3xem
2
2.5k
RecSys2024 参加報告
unonao
1
170
Featured
See All Featured
What’s in a name? Adding method to the madness
productmarketing
PRO
22
3.4k
Put a Button on it: Removing Barriers to Going Fast.
kastner
60
3.8k
Improving Core Web Vitals using Speculation Rules API
sergeychernyshev
11
590
Git: the NoSQL Database
bkeepers
PRO
429
65k
Sharpening the Axe: The Primacy of Toolmaking
bcantrill
40
2k
Six Lessons from altMBA
skipperchong
27
3.7k
Chrome DevTools: State of the Union 2024 - Debugging React & Beyond
addyosmani
4
430
How GitHub (no longer) Works
holman
314
140k
Code Reviewing Like a Champion
maltzj
521
39k
What's in a price? How to price your products and services
michaelherold
244
12k
How to Create Impact in a Changing Tech Landscape [PerfNow 2023]
tammyeverts
50
2.3k
Distributed Sagas: A Protocol for Coordinating Microservices
caitiem20
331
21k
Transcript
Sebastian P.R. Gingter | Smarthouse Media GmbH Von Subversion zu
Git
Vorab: • Sourcen & Demos @github https://github.com/gingters/... • Slides @speakerdeck
https://speakerdeck.com/phoenixhawk Sebastian P.R. Gingter | @phoenixhawk
Von Subversion zu Git Dezentrale Versionierung leicht gemacht:
Agenda • Was ist Git? • Subversion vs. Git Die
wichtigsten Unterschiede • Git - Verwendung • Git Workflows • Git Tooling • Git Hosting Sebastian P.R. Gingter | @phoenixhawk
Was ist Git? • Distributed • Versioning • Control •
System Sebastian P.R. Gingter | @phoenixhawk
Was ist Git? D Sebastian P.R. Gingter | @phoenixhawk
D Sebastian P.R. Gingter | @phoenixhawk D wie in... Was
ist Git?
D wie in... • Distributed • Decentralized • Disconnected •
Dynamic Sebastian P.R. Gingter | @phoenixhawk
Subversion vs. Git • Subversion Sebastian P.R. Gingter | @phoenixhawk
zentrales Repository 0..n Arbeitskopieen
Subversion vs. Git • Subversion Sebastian P.R. Gingter | @phoenixhawk
zentrales Repository Alles übers (langsame) Netz: • Update • Commit • Blame • Branch • Switch • Merge
Subversion vs. Git • Subversion Sebastian P.R. Gingter | @phoenixhawk
zentrales Repository • Single Point of Failure • ohne Netz keine Arbeit • häufiges Backup notwendig
Subversion vs. Git • Git Sebastian P.R. Gingter | @phoenixhawk
Repository 0..n Clones inkl. Arbeitskopien
Subversion vs. Git • Subversion: Revision • Git: Kryptographisch gesicherte
hashes – Beinhaltet • commiter • message • Hash des vorherigen commit (full tree) • Inhalt des aktuellen commits Sebastian P.R. Gingter | @phoenixhawk
Git - Verwendung • Git init • Git clone •
Git config • Git add • Git commit • Git status • Git branch • Git checkout Sebastian P.R. Gingter | @phoenixhawk
Git merge Sebastian P.R. Gingter | @phoenixhawk
Git merge Sebastian P.R. Gingter | @phoenixhawk
merge vs. rebase Sebastian P.R. Gingter | @phoenixhawk
3-way merge Sebastian P.R. Gingter | @phoenixhawk
rebase – ACHTUNG! • NIEMALS – bereits gepushte commits rebasen – Vor
allem nicht, wenn diese bereits gepullt wurden Sebastian P.R. Gingter | @phoenixhawk
Git branching Sebastian P.R. Gingter | @phoenixhawk
Git branching Sebastian P.R. Gingter | @phoenixhawk
Git tooling • http://git-scm.com/downloads • http://www.sourcetreeapp.com/ Sebastian P.R. Gingter |
@phoenixhawk
Git Hosting • In der Cloud – http://github.com – http://bitbucket.org – http://www.fogcreek.com/kiln/ Sebastian
P.R. Gingter | @phoenixhawk
Git Hosting • Selber hosten – https://www.atlassian.com/it/software/stash – https://gitorious.org/ – http://gitlab.org/ – http://www.scm-manager.org/ – Und
einige mehr Sebastian P.R. Gingter | @phoenixhawk
Git & SVN • git-svn – Brücke zwischen lokalem Git und
Subversion auf dem Server • http://viget.com/extend/effectively-using- git-with-subversion Sebastian P.R. Gingter | @phoenixhawk
Quellen • http://nvie.com/posts/a-successful-git-branching-model/ • http://blogs.remobjects.com/blogs/mh/2011/08/25/p2940 • https://www.atlassian.com/git/tutorial • https://www.atlassian.com/git/migration •
http://bassistance.de/2013/10/18/how-to-be-a-more-effective-git- historian-with-recursive-blame/ Sebastian P.R. Gingter | @phoenixhawk