Welcome to Scribd, the world's digital library. Read, publish, and share books and documents. See more
Download
Standard view
Full view
of .
Look up keyword or section
Like this
1Activity

Table Of Contents

0 of .
Results for:
No results containing your search query
P. 1
Git Magic

Git Magic

Ratings: (0)|Views: 26|Likes:
Published by dyachkoff

More info:

Published by: dyachkoff on May 04, 2011
Copyright:Attribution Non-commercial

Availability:

Read on Scribd mobile: iPhone, iPad and Android.
download as PDF, TXT or read online from Scribd
See more
See less

05/24/2012

pdf

text

original

 
Git Magic
Ben Lynn
 
Git Magic
by Ben LynnRevision HistoryAugust 2007 Revised by: BL
 
Table of Contents
Preface.......................................................................................................................................................vi
1. Thanks!..........................................................................................................................................vi2. License........................................................................................................................................vii
1. Introduction............................................................................................................................................1
1.1. Work is Play................................................................................................................................11.2. Version Control...........................................................................................................................11.3. Distributed Control......................................................................................................................11.4. A Silly Superstition.....................................................................................................................21.5. Merge Conflicts...........................................................................................................................3
2. Basic Tricks............................................................................................................................................4
2.1. Saving State.................................................................................................................................42.2. Add, Delete, Rename..................................................................................................................42.3. Advanced Undo/Redo.................................................................................................................52.4. Reverting.....................................................................................................................................62.5. Changelog Generation.................................................................................................................62.6. Downloading Files......................................................................................................................62.7. The Bleeding Edge......................................................................................................................72.8. Instant Publishing........................................................................................................................72.9. What Have I Done?.....................................................................................................................82.10. Exercise.....................................................................................................................................8
3. Cloning Around...................................................................................................................................10
3.1. Sync Computers........................................................................................................................103.2. Classic Source Control..............................................................................................................103.3. Bare repositories.......................................................................................................................113.4. Push versus pull.........................................................................................................................123.5. Forking a Project.......................................................................................................................123.6. Ultimate Backups......................................................................................................................123.7. Light-Speed Multitask ...............................................................................................................133.8. Guerilla Version Control...........................................................................................................133.9. Mercurial...................................................................................................................................143.10. Bazaar......................................................................................................................................143.11. Why I use Git..........................................................................................................................15
4. Branch Wizardry.................................................................................................................................16
4.1. The Boss Key............................................................................................................................164.2. Dirty Work ................................................................................................................................174.3. Quick Fixes...............................................................................................................................174.4. Merging.....................................................................................................................................184.5. Uninterrupted Workflow...........................................................................................................194.6. Reorganizing a Medley.............................................................................................................204.7. Managing Branches...................................................................................................................204.8. Temporary Branches.................................................................................................................214.9. Work How You Want................................................................................................................21
iii

You're Reading a Free Preview

Download
scribd
/*********** DO NOT ALTER ANYTHING BELOW THIS LINE ! ************/ var s_code=s.t();if(s_code)document.write(s_code)//-->