Download "user manual"

Table of Contents
Preface .......................................................................................................................................................vi
1. Thanks!..........................................................................................................................................vi
2. License ........................................................................................................................................ vii
1. Introduction............................................................................................................................................1
1.1. Work is Play ................................................................................................................................1
1.2. Version Control ...........................................................................................................................1
1.3. Distributed Control......................................................................................................................1
1.4. A Silly Superstition .....................................................................................................................2
1.5. Merge Conflicts...........................................................................................................................3
2. Basic Tricks ............................................................................................................................................4
2.1. Saving State.................................................................................................................................4
2.2. Add, Delete, Rename ..................................................................................................................4
2.3. Advanced Undo/Redo .................................................................................................................5
2.4. Reverting .....................................................................................................................................6
2.5. Changelog Generation.................................................................................................................6
2.6. Downloading Files ......................................................................................................................6
2.7. The Bleeding Edge......................................................................................................................7
2.8. Instant Publishing........................................................................................................................7
2.9. What Have I Done? .....................................................................................................................8
2.10. Exercise .....................................................................................................................................8
3. Cloning Around ...................................................................................................................................10
3.1. Sync Computers ........................................................................................................................10
3.2. Classic Source Control..............................................................................................................10
3.3. Bare repositories .......................................................................................................................11
3.4. Push versus pull.........................................................................................................................12
3.5. Forking a Project .......................................................................................................................12
3.6. Ultimate Backups ......................................................................................................................12
3.7. Light-Speed Multitask...............................................................................................................13
3.8. Guerilla Version Control ...........................................................................................................13
3.9. Mercurial ...................................................................................................................................14
3.10. Bazaar......................................................................................................................................14
3.11. Why I use Git ..........................................................................................................................15
4. Branch Wizardry .................................................................................................................................16
4.1. The Boss Key ............................................................................................................................16
4.2. Dirty Work ................................................................................................................................17
4.3. Quick Fixes ...............................................................................................................................17
4.4. Merging .....................................................................................................................................18
4.5. Uninterrupted Workflow ...........................................................................................................19
4.6. Reorganizing a Medley .............................................................................................................20
4.7. Managing Branches...................................................................................................................20
4.8. Temporary Branches .................................................................................................................21
4.9. Work How You Want ................................................................................................................21
iii