Git不僅可以用於構建軟件，還能做更多有意思
的事。艾瑪·簡·霍格賓·韋斯特比著的這本《用於
團隊寫作的Git（影印版）（英文版）》南展示了一
種以人為本的版本控制獨門秘技，也介紹了如何以
GIt為中心提升團隊協作效率。你將學會規劃和實現
一種Git工作流，它不僅確保你可以完成項目目標，
也能滿足你的團隊的各種突發需求和未來增長需要。
本書第一部分內容關於結構化工作流，這對於項
目經理、技術團隊負責人和CTO非常有用。第二部分
提供可以上手的練習，幫助開發者們更好地理解Git
命令。

Foreword
Foreword
Preface
Introduction

Part I. Defining Your Workflow
1. Working in Teams
The People on Your Team
Thinking Strategies
Meeting as a Team
Kickoff
Tracking Progress
Cultivating Empathy
Wrap-Up and Retrospectives
Teamwork in Terms of Git
Summary
2. Command and Control
Project Governance
Copyright and Contributor Agreements
Distribution Licenses
Leadership Models
Code of Conduct
Access Models
Dispersed Contributor Model
Collocated Contributor Repositories Model
Shared Maintenance Model
Custom Access Models
Summary
3. Branching Strategies
Understanding Branches
Choosing a Convention
Conventions
Mainline Branch Development
Branch-Per-Feature Deployment
State Branching
Scheduled Deployment
Updating Branches
Summary
4. Workflows That Work
Evolving Workflows
Documenting Your Process
Documenting Encoded Decisions
Ticket Progression
A Basic Workflow
Trusted Developers with Peer Review
Untrusted Developers with QA Gatekeepers
Releasing Software According to Schedule
Publishing a Stable Release
Ongoing Development
Post-Launch Hotfix
Collaborating on Nonsoftware Projects
Summary

Part II. Applying the Commands to Your Workflow
5. Teams of One
Issue-Based Version Control
Creating Local Repositories
Cloning an Existing Project
Converting an Existing Project to Git
Initializing an Empty Project
Reviewing History
Working with Branches
Listing Branches
Updating the List of Remote Branches
Using a Different Branch
Creating New Branches
Adding Changes to a Repository
Adding Partial File Changes to a Repository
Committing Partial Changes
Removing a File from the Stage
Writing Extended Commit Messages
Ignoring Files
Working with Tags
Connecting to Remote Repositories
Creating a New Proiect
Adding a Second Remote Connection
Pushing Your Changes
Branch Maintenance
Command Reference
Summary
6. Rollbacks, Reverts, Resets, and Rebasing
Best Practices
Describing Your Problem
Using Branches for Experimental Work
Rebasing Step by Step
Begin Rebasing
Mid-Rebase Conflict from a Deleted File
Mid-Rebase Conflict from a Single File Merge Conflict
An Overview of Locating Lost Work
Restoring Files
Working with Commits
Amending Commits
Combining Commits with Reset
Altering Commits with Interactive Rebasing
Unmerging a Branch
Undoing Shared History
Reverting a Previous Commit
Unmerging a Shared Branch
Really Removing History
Command Reference
Summary
7. Teams of More than One
Setting Up the Project
Creating a New Project
Establishing Permissions
Uploading the Project Repository
Document the Project in a README
Setting Up the Developers
Consumers
Contributors
Maintainers
Participating in Development
Constructing the Perfect Commit
Keeping Branches Up to Date
Reviewing Work
Merging Completed Work
Resolving Merge and Rebase Conflicts
Publishing Work
Sample Workflows
Sprint-Based Workflow
Trusted Developers with No Peer Review
Untrusted Developers with Independent Quality Assurance
Summary
8. Ready for Review
Types of Reviews
Types of Reviewers
Software for Code Reviews
Reviewing the Issue
Applying the Proposed Changes
Shared Repository Setup
Forked Repository Setup
Checking Out the Proposed Branch
Reviewing the Proposed Changes
Preparing Your Feedback
Submitting Your Evaluation
Completing the Review
Summary
9. Finding and Fixing Bugs
Using stash to Work on an Emergency Bug Fix
Comparative Studies of Historical Records
Investigating File Ancestry with blame
Historical Reenactment with bisect
Summary

Part III. Git Hosting
10. Open Source Projects on GitHub
Getting Started on GitHub
Creating an Account
Creating an Organization
Personal Repositories
Using Public Projects on GitHub
Downloading Repository Snapshots
Working Locally
Contributing to Projects
Tracking Changes with Issues
Forking a Project
Initiating a Pull Request
Running Your Own Project
Creating a Project Repository
Granting Co-Maintainership
Reviewing and Accepting Pull Requests
Pull Requests with Merge Conflicts
Summary
11. Private Team Work on Bitbucket
Project Governance for Nonpublic Projects
Getting Started
Creating an Account
Creating a Private Project from the Welcome Screen
Creating a Private Project from the Dashboard
Configuring Your New Repository
Exploring Your Project
Editing Files in Your Repository
Project Setup
Project Documentation in Wiki Pages
Tracking Your Changes with Issues
Access Control
Shared Access
Per-Developer Forks
Limiting Access with Protected Branches
Pull Requests
Submitting a Pull Request
Accepting a Pull Request
Extending Bitbucket with Atlassian Connect
Summary
12. Self-Hosted Collaboration with GitLab
Getting Started
Installing GitLab
Configuring the Administrative Account
Administrative Dashboard
Projects
Creating a Project
User Accounts
Creating User Accounts
Adding People to Projects
Groups
Adding People to Groups
Adding Projects to Groups
Access Control
Project Visibility
Limiting Activities with Project Roles
Limiting Access with Protected Branches
Milestones
Summary
A. Butter Tarts
B. Installing the Latest Version of Git
C. Configuring Git
D. SSH Keys
Index