2.4 Git


Git is a distributed open source source control (also referred to as “version control”) system commonly used to track and manage file changes. Git is frequently used as the version control system for Python projects.

Git is an implementation of the source control concept. Learn how these pieces fit together in the development environments chapter or view the table of contents for all topics.

Git tutorials

Git can take awhile to wrap your head around, even for experienced software developers. The following tutorials can quickly get you up to speed.

  • The official Pro Git book is available online for free. It is awesome both as a step-by-step walkthrough and as a bookmarked reference on specific topics.
  • Git from the inside out provides a spectacular walkthrough for developers who have used Git before but want to go deeper in understanding what each command does under the covers instead of simply using the tool as a black box.
  • Git and GitHub in plain English is a high-level overview of both Git and GitHub. This guide is intended for both non-programmers and junior developers who want to learn everything from terminology to workflow.
  • A Designer’s Guide to Git gives a beginner’s Git overview for non-programmers. The tutorial also covers using Git clients such as the GitHub desktop application.
  • Git in Six Hundred Words is a concise essay explaining what happens when you add and commit files in a Git repository.
  • A practical git introduction is rich with pragmatic examples for Git usage.

Specific Git resources

Large tutorials are great for getting started with Git. However, sometimes you need tactical support or want to learn new tricks to add to your workflow. These resources will come in handy for specific Git subjects.

  • How to Write a Git Commit Message provides strong advice that will help you write consistent, concise and contextual messages on your commits. Commit messages are especially important when working with others on a long-lasting project where you dive through the commit history via git log and related commands.
  • Oh shit, Git! is a profanity-filled description of tips to get you out of binds you may find yourself in when you get too tricky with Git commands.
  • Phil Nash shows how to use the git reflog command in Git back to the future.
  • Another Git catastrophe cleaned up goes through a difficult merge scenario that required deep Git understanding to properly fix.
  • Erlang’s source code provides a concise explanation on writing good commit messages that any programming ecosystem can learn from.
  • GitTips is a list of pro tips to clean up common issues and how to dive through Git history to find specific text.
  • 19 Tips For Everyday Git Use is a laundry list of helpful Git tips on commands such as git bisect, git stash and git difftool.
  • Git allows command aliasing, which allowed one developer to create his own list of lesser known Git commands that alias more complicated Git lines.
  • Git from the inside out demonstrates how Git’s graph-based data structure produces certain behavior through example Git commands. This is a highly recommended read after you’ve grasped the basics and are looking to go deeper with Git.
  • How To Host Your Own Private Git Repositories provides the steps for handling private Git repositories on your own server. This setup is great for either mirroring GitHub repositories or just getting away from hosted services entirely.
  • How I configure my git in a new computer shows how to handle a .gitconfig file, with an example Gist that the author uses for his own environment.

Git Workflows

Teams of developers can use Git in varying workflows because of Git’s distributed model and lightweight branching. There is no “right way” to use Git, especially because development teams can range in size from a single developer up to entire companies with thousands of developers in a repository. The only correct answer is to let the developers decide on a workflow that maximizes their ability to frequently commit code and minimize merge conflicts.

  • git-flow shows one possible way for small teams to use Git branches. GitHub Flow explains why at GitHub they do not use the git-flow model and provides an alternative that solves some of the issues they found with git-flow.
  • Git Workflows That Work is a helpful post with diagrams to show how teams can create a Git workflow that will help their development process.
  • Our Git Workflow” by Braintree goes over how this payments company uses Git for development and merging source code.


电子邮件地址不会被公开。 必填项已用*标注