The Git rebase command tries to find out the common ancestor between the current local branch and the merge branch. For example, your local branch has commits A−>B−>C−>D and the merge branch has commits A−>B−>X−>Y, then git merge will convert the current local branch to something like A−>B−>C−>D−>X−>Y The Git merge command tries to put the commits from other branches on top of the HEAD of the current local branch. The Git rebase command is a branch merge command, but the difference is that it modifies the order of commits.
GIT CREATE BRANCH INPLACE CODE
We can verify it by viewing the commit message or by viewing the modifications done into the string_operation.c project]$ cd src]$ git log -1Īdded w_strlen function to return string lenght of wchar_t src]$ head -12 string_operations.cĪfter testing, he pushes his code changes to the master src]$ git push origin master Now, the branch wchar_support has been merged with the master branch. * project]$ project]$ git merge origin/wchar_supportĪfter the merge operation, the master branch will appear as follows − Instead of re-implementing, he decides to take Jerry’s code by merging his branch with the master project]$ git branch The above command will produce the following result.Ĭommit 64192f91d7cc2bcdf3bf946dd33ece63b74184a3Īdded w_strlen function to return string lenght of wchar_t stringĬommit 577647211ed44fe2ae479427a0668a4f12ed71a1īy viewing commit messages, Tom realizes that Jerry implemented the strlen function for wide character and he wants the same functionality in the master branch. Tom is curious about what Jerry is doing in his private branch and he checks the log from the wchar_support src]$ src]$ git log origin/wchar_support -2 Note that Jerry is pushing these changes to the new branch, which is why he used the branch name wchar_support instead of master src]$ git push origin wchar_support wchar_supportĪfter committing the changes, the new branch will appear as follows − Added w_strlen function to return string lenght of wchar_t stringġ files changed, 10 insertions(+), 0 deletions(-) ? src]$ git add src]$ git commit -m 'Added w_strlen function to return string lenght of wchar_t T a/src/string_operations.c b/src/string_operations.cĪfter testing, he commits and pushes his changes to the new src]$ git status -s The above command produces the following result − New the code will appear as follows src]$ git branch Jerry implements a function to return the string length of wide character string. Now, the git branch command will show the new branch src]$ git branch * src]$ git branch -m new_branch wchar_support So he changes the branch name by using –m option followed by the old branch name and the new branch src]$ git branch He has already created a new branch, but the branch name is not appropriate. Jerry decides to add support for wide characters in his string operations project. Now, Git will show only two src]$ git branch Switched to branch src]$ git branch -D test_branchĭeleted branch test_branch (was 5776472). So he switches branch and deletes branch as shown src]$ git branch Jerry is currently on test_branch and he wants to remove that branch. But before deleting the existing branch, switch to the other branch.
Switched to a new branch src]$ git branchĪ branch can be deleted by providing –D option with git branch command. Git provides –b option with the checkout command this operation creates a new branch and immediately switches to the new src]$ git checkout -b test_branch
In the above example, we have used two commands to create and switch branches, respectively. Jerry uses the git checkout command to switch between src]$ git checkout new_branch The pictorial representation of create branch operation is shown below − Switch between Branches Git shows an asterisk mark before currently checked out branch. If any specific commit ID is not provided, then the branch will be created with HEAD as its starting src]$ git branch src]$ git branchĪ new branch is created Tom used the git branch command to list the available branches. We can use a specific commit or tag as the starting point. We can create a new branch from an existing one. Tom creates a new branch using the git branch command. For example, we released a product for 6.0 version and we might want to create a branch so that the development of 7.0 features can be kept separate from 6.0 bug fixes. We can use this operation to fork off the development process into two different directions. Branch operation allows creating another line of development.
0 kommentar(er)
