An alternative to submodules is subtree merging. Subtree merging is a strategy that can be used while performing merges with Git. The subtree merge strategy is useful when merging a branch (or as we'll see in this recipe another project) into a subdirectory of a Git repository instead of the root directory. When using the subtree merge strategy, the history of the subproject is joined with the history of the super project, while the subproject's history can be kept clean except for commits indented to go upstream.
Git Version Control Cookbook
Git Version Control Cookbook
Overview of this book
Table of Contents (19 chapters)
Git Version Control Cookbook
Credits
About the Authors
About the Reviewers
www.PacktPub.com
Preface
Free Chapter
Navigating Git
Configuration
Branching, Merging, and Options
Rebase Regularly and Interactively, and Other Use Cases
Storing Additional Information in Your Repository
Extracting Data from the Repository
Enhancing Your Daily Work with Git Hooks, Aliases, and Scripts
Recovering from Mistakes
Repository Maintenance
Patching and Offline Sharing
Git Plumbing and Attributes
Tips and Tricks
Index
Customer Reviews