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
120
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
50
SEACON 2024 - Talk to your Data
phoenixhawk
0
70
MLCon 2024 - Bootcamp: Conquer and Rule Generative AI
phoenixhawk
0
92
InfoDays Generative AI für Developer 2024
phoenixhawk
0
61
EKON 2024 - Prompt Injections, Halluzinationen und Co.
phoenixhawk
0
48
EKON 2024: Real World RAG mit eigenen Daten und Dokumenten
phoenixhawk
0
89
Gen AI Engineering Days - Prompt Injections, Hallucinations and More
phoenixhawk
0
95
Gen AI Engineering Days - Talk to your Data
phoenixhawk
0
71
"Talk to your data": Improving RAG solutions based on real-world experiences
phoenixhawk
0
34
Other Decks in Programming
See All in Programming
Qiita Bash
mercury_dev0517
2
200
Defying Front-End Inertia: Inertia.js on Rails
skryukov
0
480
音声プラットフォームのアーキテクチャ変遷から学ぶ、クラウドネイティブなバッチ処理 (20250422_CNDS2025_Batch_Architecture)
thousanda
0
160
Agentic Applications with Symfony
el_stoffel
2
300
Compose Hot Reload is here, stop re-launching your apps! (Android Makers 2025)
zsmb
1
500
Exit 8 for SwiftUI
ojun9
0
130
AIコーディングの理想と現実
tomohisa
20
25k
MCP調べてみました! / Exploring MCP
uhzz
2
2.3k
List とは何か? / PHPerKaigi 2025
meihei3
0
860
Unlock the Potential of Swift Code Generation
rockname
0
250
Java 24まとめ / Java 24 summary
kishida
3
500
PHPで書いたAPIをGoに書き換えてみた 〜パフォーマンス改善の可能性を探る実験レポート〜
koguuum
0
150
Featured
See All Featured
XXLCSS - How to scale CSS and keep your sanity
sugarenia
248
1.3M
Speed Design
sergeychernyshev
29
900
Side Projects
sachag
452
42k
Easily Structure & Communicate Ideas using Wireframe
afnizarnur
194
16k
Product Roadmaps are Hard
iamctodd
PRO
52
11k
GraphQLの誤解/rethinking-graphql
sonatard
71
10k
Scaling GitHub
holman
459
140k
Practical Tips for Bootstrapping Information Extraction Pipelines
honnibal
PRO
19
1.1k
RailsConf 2023
tenderlove
30
1.1k
Build your cross-platform service in a week with App Engine
jlugia
229
18k
Thoughts on Productivity
jonyablonski
69
4.6k
ReactJS: Keep Simple. Everything can be a component!
pedronauck
666
120k
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