|
You are here |
initialcommit.com | ||
| | | | |
andreabergia.com
|
|
| | | | | Git has an excellent tool designed to help you reorder the commit history: interactive rebase. This can be excellent if you want to keep the history clean, so that it helps other programmers understand the logic behind the changes rather than the actual sequence of commits. Let's walk through an example. Let's write some history Link to heading Let's start by creating an empty project in a new directory: | |
| | | | |
ejpcmac.net
|
|
| | | | | ||
| | | | |
www.integralist.co.uk
|
|
| | | | | Introduction git merge git merge --no-ff --edit git reset Force the merge commit git branch --contains Losing useful history git merge --squash git rebase git rebase --interactive git rebase --onto git format-patch Conclusion Introduction Imagine I have a master branch with one commit: 75eb1cb - (origin/master) README This is a single README.md file with the following content: - A: 1 Now imagine I have a branch from master called feat/foo and in that branch I've made 3 additional commits: | |
| | | | |
ryanharter.com
|
|
| | | This is the second post in my Start to Finish series. You can check out my first post introducing the series and my tools here. What is SCM? SCM, or source code management, is a system that helps developers manage the source code for their projects. They have been around forever, things like CVS, Subversion (SVN) and now Git are the popular ones. SCMs allow you to version your source code, which is why they are also called Version Control Systems. | ||