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 18: Git
Search
Sebastian Gingter
November 04, 2014
Programming
0
130
EKON 18: Git
My slides for the EKON 18 (2014) talk about Git.
Sebastian Gingter
November 04, 2014
Tweet
Share
More Decks by Sebastian Gingter
See All by Sebastian Gingter
From Zero to Hero: How to put GPT LLMs & Friends into your Applications
phoenixhawk
0
10
DWX 2025 - Talk to your data
phoenixhawk
0
7
BASTA! Spring 2025 - Halluzinationen, Prompt Injections & Co.
phoenixhawk
0
76
SEACON 2024 - Talk to your Data
phoenixhawk
0
98
MLCon 2024 - Bootcamp: Conquer and Rule Generative AI
phoenixhawk
0
120
InfoDays Generative AI für Developer 2024
phoenixhawk
0
95
EKON 2024 - Prompt Injections, Halluzinationen und Co.
phoenixhawk
0
81
EKON 2024: Real World RAG mit eigenen Daten und Dokumenten
phoenixhawk
0
110
Gen AI Engineering Days - Prompt Injections, Hallucinations and More
phoenixhawk
0
130
Other Decks in Programming
See All in Programming
Is Xcode slowly dying out in 2025?
uetyo
1
280
Porting a visionOS App to Android XR
akkeylab
0
480
たった 1 枚の PHP ファイルで実装する MCP サーバ / MCP Server with Vanilla PHP
okashoi
1
260
新メンバーも今日から大活躍!SREが支えるスケールし続ける組織のオンボーディング
honmarkhunt
5
7.6k
テストから始めるAgentic Coding 〜Claude Codeと共に行うTDD〜 / Agentic Coding starts with testing
rkaga
13
4.7k
型で語るカタ
irof
0
130
ソフトウェア品質を数字で捉える技術。事業成長を支えるシステム品質の マネジメント
takuya542
2
13k
PicoRuby on Rails
makicamel
2
130
10 Costly Database Performance Mistakes (And How To Fix Them)
andyatkinson
0
400
GitHub Copilot and GitHub Codespaces Hands-on
ymd65536
2
150
Modern Angular with Signals and Signal Store:New Rules for Your Architecture @enterJS Advanced Angular Day 2025
manfredsteyer
PRO
0
220
Webの外へ飛び出せ NativePHPが切り拓くPHPの未来
takuyakatsusa
2
560
Featured
See All Featured
Navigating Team Friction
lara
187
15k
A designer walks into a library…
pauljervisheath
207
24k
Optimising Largest Contentful Paint
csswizardry
37
3.3k
Facilitating Awesome Meetings
lara
54
6.4k
Git: the NoSQL Database
bkeepers
PRO
430
65k
XXLCSS - How to scale CSS and keep your sanity
sugarenia
248
1.3M
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
138
34k
A Modern Web Designer's Workflow
chriscoyier
695
190k
Building Applications with DynamoDB
mza
95
6.5k
Speed Design
sergeychernyshev
32
1k
Fashionably flexible responsive web design (full day workshop)
malarkey
407
66k
Testing 201, or: Great Expectations
jmmastey
43
7.6k
Transcript
Sebastian P.R. Gingter | Smarthouse Media GmbH Verteiltes Leid is
halbes Leid: Git in der Praxis
Vorab: • Sourcen & Demos @github https://github.com/gingters/... • Slides @speakerdeck
https://speakerdeck.com/phoenixhawk Sebastian P.R. Gingter | @phoenixhawk
Git in der Praxis Verteiltes Leid ist halbes Leid
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