continue from the Fast-forward Merge exercise
- Create a branch called greeting and check it out
- Edit the greeting.txt to contain your favorite greeting
- Add greeting.txt files to the staging area
- Commit
- Switch back to the master branch
- Create a file README.md with information about this repository
- Add the README.md file to staging area and make the commit
- What is the output of
git log --oneline --graph --all? - Diff the branches
- Merge the greeting branch into master
- What is the output of
git log --oneline --graph --allnow? Observe the extra merge commit created with the message "Merge branch 'greeting'".
git branchgit branch <branch-name>git branch -d <branch-name>git checkout <branch-name>git checkout -b <branch-name>git branch -vgit addgit commitgit commit -mgit merge <branchA> <branchB>git diff <branchA> <branchB>git log --oneline --graph --all