Learn GIT in a Month of Lunches

378 Pages·2015·23.058 MB·English

by  Rick Umali

Learn Git in a Month of Lunches
ii
Learn Git in a
Month of Lunches
RICK UMALI
MANNING
SHELTER ISLAND
iv
For online information and ordering of this and other Manning books, please visit
www.manning.com. The publisher offers discounts on this book when ordered in quantity.
For more information, please contact
Special Sales Department
Manning Publications Co.
20 Baldwin Road
PO Box 761
Shelter Island, NY 11964
Email: [email protected]
©2015 by Manning Publications Co. All rights reserved.
No part of this publication may be reproduced, stored in a retrieval system, or transmitted, in
any form or by means electronic, mechanical, photocopying, or otherwise, without prior written
permission of the publisher.
Many of the designations used by manufacturers and sellers to distinguish their products are
claimed as trademarks. Where those designations appear in the book, and Manning
Publications was aware of a trademark claim, the designations have been printed in initial caps
or all caps.
Recognizing the importance of preserving what has been written, it is Manning’s policy to have
the books we publish printed on acid-free paper, and we exert our best efforts to that end.
Recognizing also our responsibility to conserve the resources of our planet, Manning books are
printed on paper that is at least 15 percent recycled and processed without elemental chlorine.
Manning Publications Co. Development editor: Helen Sturgis
20 Baldwin Road Technical development editor: Jonathan Thoms
PO Box 761 Copyeditor: Sharon Wilkey
Shelter Island, NY 11964 Proofreader: Corbin Collins
Technical proofreader: Karsten Strøbaek
Typesetter: Marija Tudor
Cover designer: Leslie Haimes
ISBN: 9781617292415
Printed in the United States of America
1 2 3 4 5 6 7 8 9 10 – EBM – 20 19 18 17 16 15
brief contents
1 ■ Before you begin 1
2 ■ An overview of Git and version control 8
3 ■ Getting oriented with Git 25
4 ■ Making and using a Git repository 36
5 ■ Using Git with a GUI 47
6 ■ Tracking and updating files in Git 61
7 ■ Committing parts of changes 76
8 ■ The time machine that is Git 98
9 ■ Taking a fork in the road 119
10 ■ Merging branches 140
11 ■ Cloning 160
12 ■ Collaborating with remotes 177
13 ■ Pushing your changes 192
14 ■ Keeping in sync 214
15 ■ Software archaeology 239
16 ■ Understanding git rebase 261
17 ■ Workflows and branching conventions 279
v
vi BRIEF CONTENTS
18 ■ Working with GitHub 293
19 ■ Third-party tools and Git 311
20 ■ Sharpening your Git 328
contents
preface xvii
about this book xix
acknowledgments xxii
1 Before you begin 1
1.1 What makes Git so special? 1
1.2 Is this book for you? 3
1.3 How to use this book 3
1.4 Installing Git 4
1.5 Your learning path 5
1.6 Online resources 7
1.7 Being immediately effective 7
2 An overview of Git and version control 8
2.1 Version control concepts 8
Version control for the software developer 8 ■ Version control for
the organization 9 ■ What is a repository? 10 ■ What is a
commit? 11 ■ What is a branch? 12
vii
viii CONTENTS
2.2 Git’s key features 14
Distributed repositories 15 ■ Fast branching 16
The staging area 17
2.3 A quick tour of Git 17
Using the GUI to tour a Git repository 18 ■ Using the command
line to tour a Git repository 21
2.4 Version control terminology 24
3 Getting oriented with Git 25
3.1 Getting set up 25
3.2 Using commands 27
Git command-line syntax 27 ■ Common commands 28
3.3 Improving command-line efficiency 30
3.4 Using Git help 31
3.5 Controlling long output with a pager 33
3.6 Lab 34
3.7 Further exploration 34
3.8 Commands in this chapter 35
4 Making and using a Git repository 36
4.1 Understanding repository basics 36
4.2 Creating a new repository with git init 37
4.3 Tracking files with git status and git add 39
Using git status to check your repository state 39 ■ Using git add
to add a file to your repository 41
4.4 Committing files with git commit 42
4.5 Viewing the repository with git log and ls-files 44
4.6 Lab 45
4.7 Commands in this chapter 46
5 Using Git with a GUI 47
5.1 Starting Git GUI 47
Starting Git GUI in Windows 48
5.2 Creating a repository with Git GUI 49
5.3 Adding a file into the repository via Git GUI 51
5.4 Looking at your history 57
CONTENTS ix
5.5 Lab 58
5.6 Further exploration 59
Other GUIs for Git 59 ■ Tcl, Tk, and Wish 59
5.7 Commands in this chapter 60
6 Tracking and updating files in Git 61
6.1 Making simple changes 61
Creating a new repository 61 ■ Telling Git about changes 62
Seeing what’s different 63 ■ Adding and committing changes to
the repo 64
6.2 Thinking about git add 65
An analogy to introduce the staging area 65 ■ Adding changes
to the staging area 66 ■ Updating the staging area 66
Understanding the staging area 67 ■ Committing
changes 70
6.3 Adding multiple files 72
6.4 Lab 74
Understanding command-line nuances 74 ■ Getting out of
trouble 74 ■ Adding your own file 74
6.5 Further exploration 74
6.6 Commands in this chapter 75
7 Committing parts of changes 76
7.1 Deleting files from Git 76
7.2 Renaming files in Git 78
7.3 Adding directories into your repository 81
7.4 Adding parts of changes 83
Reconsidering the stage analogy 83 ■ Considering when to
commit 84 ■ Committing parts of a file by using Git GUI 86
Committing parts of a file using git add -p 90 ■ Removing
changes from the staging area 93 ■ Resetting a file to the last
committed version 94 ■ Understanding consequences of partial
commits 95
7.5 Lab 96
Working with multiple hunks 96 ■ Changing your mind with a
delete 97 ■ Reading assignments 97
7.6 Commands in this chapter 97