-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathfix2.txt
More file actions
32 lines (32 loc) · 867 Bytes
/
fix2.txt
File metadata and controls
32 lines (32 loc) · 867 Bytes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
git init
git add README.md
git commit -m "Initial commit"
git checkout -b feature1
sed -i '' 's/moose/mouse/' README.md
git add README.md
git commit -m "Changed moose to mouse and added dog"
git checkout main
sed -i '' 's/moose/mammoth/' README.md
git add README.md
git commit -m "Changed moose to mammoth"
git merge feature1
git add README.md
git commit -m "Merged feature1 into main, resolved conflicts"
git reset --hard HEAD~1
git branch feature2
git add README.md
git commit -m "Capitalized animal names"
git checkout feature2
git add fix1.txt
git commit -m "Added fix1.txt"
git add fix2.txt
git commit -m "Added fix2.txt"
git checkout main
git cherry-pick 574f903
git checkout -b cleanup_test
git commit -m "Added bird"
git commit -m "Added fish"
git commit -m "Added snake"
git rebase -i HEAD~3
git commit -m "Addid turtle"
git commit --amend -m "Added turtle"