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
SEACON 2024 - Talk to your Data
phoenixhawk
0
47
MLCon 2024 - Bootcamp: Conquer and Rule Generative AI
phoenixhawk
0
65
InfoDays Generative AI für Developer 2024
phoenixhawk
0
44
EKON 2024 - Prompt Injections, Halluzinationen und Co.
phoenixhawk
0
28
EKON 2024: Real World RAG mit eigenen Daten und Dokumenten
phoenixhawk
0
67
Gen AI Engineering Days - Prompt Injections, Hallucinations and More
phoenixhawk
0
72
Gen AI Engineering Days - Talk to your Data
phoenixhawk
0
50
"Talk to your data": Improving RAG solutions based on real-world experiences
phoenixhawk
0
27
cim Lingen 2024 - Wieso versteht mich der Computer auf einmal? - Wir lüften das Geheimnis von Embeddings
phoenixhawk
0
53
Other Decks in Programming
See All in Programming
chibiccをCILに移植した結果 (NGK2025S版)
kekyo
PRO
0
210
昭和の職場からアジャイルの世界へ
kumagoro95
1
350
個人アプリを2年ぶりにアプデしたから褒めて / I just updated my personal app, praise me!
lovee
0
340
“あなた” の開発を支援する AI エージェント Bedrock Engineer / introducing-bedrock-engineer
gawa
11
1.8k
時計仕掛けのCompose
mkeeda
1
280
2024年のkintone API振り返りと2025年 / kintone API look back in 2024
tasshi
0
210
AHC041解説
terryu16
0
590
Ruby on cygwin 2025-02
fd0
0
140
sappoRo.R #12 初心者セッション
kosugitti
0
230
Djangoアプリケーション 運用のリアル 〜問題発生から可視化、最適化への道〜 #pyconshizu
kashewnuts
1
230
法律の脱レガシーに学ぶフロントエンド刷新
oguemon
5
730
パスキーのすべて ── 導入・UX設計・実装の紹介 / 20250213 パスキー開発者の集い
kuralab
3
670
Featured
See All Featured
VelocityConf: Rendering Performance Case Studies
addyosmani
328
24k
Rebuilding a faster, lazier Slack
samanthasiow
79
8.8k
ReactJS: Keep Simple. Everything can be a component!
pedronauck
666
120k
The MySQL Ecosystem @ GitHub 2015
samlambert
250
12k
The Pragmatic Product Professional
lauravandoore
32
6.4k
The Web Performance Landscape in 2024 [PerfNow 2024]
tammyeverts
4
400
実際に使うSQLの書き方 徹底解説 / pgcon21j-tutorial
soudai
175
51k
Build your cross-platform service in a week with App Engine
jlugia
229
18k
Building Better People: How to give real-time feedback that sticks.
wjessup
366
19k
Learning to Love Humans: Emotional Interface Design
aarron
273
40k
Cheating the UX When There Is Nothing More to Optimize - PixelPioneers
stephaniewalter
280
13k
How To Stay Up To Date on Web Technology
chriscoyier
790
250k
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