Rebasing allows you to incorporate changes from one branch onto another branch by modifying the commit history. It replays the commits from the source branch onto the target branch. This results in a cleaner and more linear commit history.
Example: Let's say you have a feature branch called
feature-branch and you want to incorporate the latest changes from the
main branch. You can use the following command:
git checkout feature-branch git rebase main
This will apply the commits from the
main branch onto the
feature-branch. Any conflicts will need to be resolved during the rebase process.
Stashing allows you to save your current changes, which are not ready to be committed, and temporarily revert back to a clean working directory. This is useful when you need to switch to a different branch or work on a different feature without committing the changes you are currently working on.
Example: Let's say you are working on a feature branch and you have made some changes, but you need to switch to another branch. You can use the following commands to stash your changes:
fter switching to the new branch, you can then apply the stashed changes using:
git stash apply
Git Hooks are scripts that are triggered by specific Git events, such as pre-commit, post-commit, pre-push, etc. They allow you to automate certain actions or enforce specific rules in your workflow.
Example: Suppose you want to run a linter on your code before committing. You can create a pre-commit hook script that triggers the linter and prevents the commit if there are any linting errors.
Git Submodules allow you to include another Git repository as a subdirectory within your main repository. This is useful when you have a project that depends on external libraries or components.
Example: You have a project that requires a specific library. Instead of duplicating the library's code in your repository, you can add it as a submodule. This way, you can keep the library code separate and easily update it when needed.
Git Revert and Git Reset
Git Revert undoes a previous commit by creating a new commit that undoes the changes made in the original commit.
Git Reset, on the other hand, allows you to move the branch pointer to a different commit, effectively discarding commits from the commit history.
Example: If you want to undo the last commit, you can use
git revert HEAD to create a new commit that undoes the changes made in the last commit. If you want to discard the last commit completely, you can use
git reset HEAD~1 to move the branch pointer back by one commit.
These advanced concepts in Git provide powerful capabilities to manage your repository effectively. Understanding how to use them and when to apply them will greatly enhance your Git workflow and project management.