Power Git: Rerere, bisect, subtrees, filter branch, worktrees, submodules, and more

Description

If you’re doing anything with open source these days, the chances are very high that you’re working with Git. Many people know enough of Git’s basic operations to get them through but haven’t found the time—or even know where to go—to learn about Git’s advanced functionality. Git has an immense collection of power operations and techniques that can help users simplify their development process and deal with the challenges that today’s multibranch and multirepository projects often introduce.

Join Brent Laster to take your Git skills to the next level and learn useful techniques—some that have existed in Git for years and some that were included in very recent versions—for managing your source code more easily than ever before.

Topics include:

• How to use the rerere functionality to teach Git how to automatically resolve merge conflicts that reoccur
• How to use the bisect functionality to quickly find where a problem was introduced in a project’s history
• How to use the new worktrees functionality to work in multiple branches at one time in Git
• How to use subtrees and submodules to simplify handling of multirepository projects, including the advantages, disadvantages, and differences between the two approaches
• How to use the filter branch functionality to split subdirectories out into their own projects and remove undesirable content in history
• How to use the built-in grep command to search in Git
• How to use the notes functionality to annotate your Git history