Version Control with Git

Inhaltsverzeichnis



Chapter 1 Introduction



Background



The Birth of Git



Precedents



Time Line



What's in a Name?



Chapter 2 Installing Git



Using Linux Binary Distributions



Obtaining a Source Release



Building and Installing



Installing Git on Windows



Chapter 3 Getting Started



The Git Command Line



Quick Introduction to Using Git



Configuration Files



Inquiry



Chapter 4 Basic Git Concepts



Basic Concepts



Object Store Pictures



Git Concepts at Work



Chapter 5 File Management and the Index



It's All About the Index



File Classifications in Git



Using git add



Some Notes on Using git commit



Using git rm



Using git mv



A Note on Tracking Renames



The .gitignore File



A Detailed View of Git's Object Model and Files



Chapter 6 Commits



Atomic Changesets



Identifying Commits



Commit History



Finding Commits



Chapter 7 Branches



Reasons for Using Branches



Branch Names



Using Branches



Creating Branches



Listing Branch Names



Viewing Branches



Checking Out Branches



Deleting Branches



Chapter 8 Diffs



Forms of the git diff Command



Simple git diff Example



git diff and Commit Ranges



git diff with Path Limiting



Comparing How Subversion and Git Derive diffs



Chapter 9 Merges



Merge Examples



Working with Merge Conflicts



Merge Strategies



How Git Thinks About Merges



Chapter 10 Altering Commits



Caution About Altering History



Using git reset



Using git cherry-pick



Using git revert



reset, revert, and checkout



Changing the Top Commit



Rebasing Commits



Chapter 11 Remote Repositories



Repository Concepts



Referencing Other Repositories



Example Using Remote

Jon Loeliger is a freelance software engineer who contributes to Open Source projects such as Linux, U-Boot, and Git. He has given tutorial presentations on Git at many conferences including Linux World, and has written several papers on Git for Linux Magazine.

In prior lives, Jon has spent a number of years developing highly optimizing compilers, router protocols, Linux porting, and the occasional game. Jon holds degrees in Computer Science from Purdue University. In his spare time, he is a home winemaker.

Matthew McCullough, Vice President of Training for GitHub.com, is an energetic 15-year veteran of enterprise software development, world-traveling open source educator, and co-founder of a US consultancy. All these activities provide him avenues of sharing success stories of leveraging Git and GitHub. Matthew is a contributing author to the Gradle and Jenkins O'Reilly books, as well as the creator of the Git Master Class series for O'Reilly. Matthew also regularly speaks on the No Fluff Just Stuff Java symposium series. He is the author of the DZone Git RefCard, and president of the Denver Open Source Users Group.

"Besonders das Kapitel über Merges ist sehr interessant und detailreich geschrieben und man erfährt eine Menge Dinge über Mergestrategien und wie sie in einem verteilten Versionssystem anzuwenden ist. Hier könnten sich andere Bücher über Versionskontrollsysteme durchaus eine Scheibe abschneiden." - IT-Stammtisch Darmstadt, Januar 2010

"[Das Buch bietet] eine bislang nicht da gewesene Tiefe: komplizierte Merge-Szenarien, Tipps für Teams mit verteilten Repositories, typische Fallstricke beim scheinbar mühelosen Ändern bereits erfolgter Commits. All das macht das Buch zum kaum entbehrlichen Ratgeber für Git, dessen Entwicklung immmer noch rasant fortschreitet. [...]ausgesprochen dicht geschrieben und gespickt mit Informationen, die so kondensiert noch niemand zusammengetragen hat." - Linux-Magazin, August 2009