#git tutorial | Version Control with Git | Advanced Git смотреть онлайн

#git tutorial | Version Control with Git | Advanced Git
git Rebasing, git Interactive Rebasing, git Cherry Picking, git Resetting and Reverting, git Stashing
What is git rebase?
Rebasing is the process of moving or combining a sequence of commits to a new base commit.
Rebasing is changing the base of your branch from one commit to another making it appear as if you'd created your branch from a different commit.
Internally, Git accomplishes this by creating new commits and applying them to the specified base.
Even though the branch looks the same, it's composed of entirely new commits.
To maintain a linear project history.
The benefits of having a clean history become tangible when performing Git operations to investigate the introduction of a regression. E.g:
1. A bug is identified in the main branch. A feature that was working successfully is now broken.
2. A developer examines the history of the main branch using git log because of the "clean history" the developer is quickly able to reason about the history of the project.
3. The developer can not identify when the bug was introduced using git log so the developer executes a git bisect.
4. Because the git history is clean, git bisect has a refined set of commits to compare when looking for the regression. The developer quickly finds the commit that introduced the bug and is able to act accordingly.
Integrating your Feature into main Branch
You have two options:
merging directly or
rebasing and then merging.
The former option results in a 3-way merge and a merge commit, while the latter results in a fast-forward merge and a perfectly linear history.
Rebasing and fast-forward merge
Rebasing is a common way to integrate upstream changes into your local repository.
Pulling in upstream changes with Git merge results in a superfluous merge commit every time you want to see how the project has progressed.
On the other hand, rebasing is like saying, “I want to base my changes on what everybody has already done.”
Rebase Standard vs Rebase Interactive