-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add demo videos for fix your mistakes section. These videos demonstrate how to fix common mistakes using amend, restore and multiple commits.
- Loading branch information
1 parent
a25fcbf
commit 0c5c9fe
Showing
9 changed files
with
163 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
Output ../../public/videos/fix-your-mistakes-amend.webm | ||
|
||
Set Width 1050 | ||
Set Height 700 | ||
|
||
Source tapes/sources/init.tape | ||
Source tapes/sources/git-commit-feature1.tape | ||
|
||
Ctrl+L | ||
|
||
Show Sleep 1 | ||
|
||
Type "git show -p" Sleep 1 Enter Sleep 3 | ||
|
||
Ctrl +L Sleep 0.25 | ||
|
||
Source tapes/source/git-commit-feature1-improve.tape | ||
|
||
Type "git commit --amend --no-edit" Sleep 1 Enter Sleep 3 | ||
|
||
Ctrl+L Sleep 0.25 | ||
|
||
Type "git show -p" Sleep 1 Enter Sleep 3 | ||
|
||
Source tapes/sources/terminate.tape |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
Output ../../public/videos/fix-your-mistakes-commit.webm | ||
|
||
Set Width 1050 | ||
Set Height 700 | ||
|
||
Source tapes/sources/init.tape | ||
Source tapes/sources/git-commit-feature1.tape | ||
|
||
Ctrl+L | ||
|
||
Show Sleep 1 | ||
|
||
Type "git show -p" Sleep 1 Enter Sleep 3 | ||
|
||
Ctrl +L Sleep 0.25 | ||
|
||
Source tapes/sources/git-commit-feature1-improve.tape | ||
|
||
Type "git commit" Sleep 1 Enter | ||
Type "i" Sleep 0.25 | ||
Type "Improve feature1" Sleep 1 | ||
Escape | ||
Type "ZZ" Sleep 3 | ||
|
||
Ctrl+L Sleep 0.25 | ||
|
||
Type "git show -p main.." Sleep 1 Enter Sleep 3 | ||
Type " " Sleep 3 | ||
Type "q" Sleep 1 | ||
|
||
Source tapes/sources/terminate.tape |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
Output ../../public/videos/fix-your-mistakes-restore.webm | ||
|
||
Set Width 1050 | ||
Set Height 700 | ||
|
||
Source tapes/sources/init.tape | ||
|
||
Source tapes/sources/git-commit-feature1.tape | ||
Source tapes/sources/git-commit-feature1-improve.tape | ||
Source tapes/sources/git-commit-feature1-unrelated.tape | ||
|
||
Type "git commit" Sleep 0.25 Enter | ||
Type "i" Sleep 0.25 | ||
Type "Fix" Sleep 0.25 | ||
Escape | ||
Type "ZZ" Sleep 0.25 | ||
|
||
Type "git rebase -i main" Enter Sleep 0.25 | ||
Down | ||
Type "cw" Sleep 0.25 | ||
Type "f" Sleep 0.25 | ||
Escape | ||
Type "ZZ" | ||
|
||
Ctrl+L | ||
|
||
Show Sleep 1 | ||
|
||
Type "git show -p" Sleep 1 Enter Sleep 3 | ||
Type " " Sleep 1 | ||
Type "q" Enter Sleep 1 | ||
|
||
Ctrl+L Sleep 0.25 | ||
|
||
Type "git restore --source=main --patch" Sleep 1 Enter Sleep 3 | ||
Type "s" Sleep 1 Enter Sleep 3 | ||
Type "y" Sleep 1 Enter Sleep 3 | ||
Type "n" Sleep 1 Enter Sleep 3 | ||
|
||
Ctrl+L Sleep 0.25 | ||
|
||
Type "git diff" Sleep 1 Enter Sleep 3 | ||
|
||
Ctrl+L Sleep 0.25 | ||
|
||
Type "git add -p" Enter Sleep 3 | ||
Type "y" Sleep 1 Enter Sleep 1 | ||
|
||
Type "git commit --amend --no-edit" Sleep 1 Enter Sleep 3 | ||
|
||
Ctrl+L Sleep 0.25 | ||
|
||
Type "git show -p" Sleep 1 Enter Sleep 3 | ||
|
||
Source tapes/sources/terminate.tape |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
Type "vim .data" Enter Sleep 1 | ||
Type "8Gi" Sleep 0.25 | ||
Type "IMPROVED " Sleep 1 | ||
Escape | ||
Type "ZZ" Sleep 1 | ||
|
||
Type "git add -p" Enter Sleep 3 | ||
Type "y" Sleep 1 Enter Sleep 1 |
8 changes: 8 additions & 0 deletions
8
scripts/video/tapes/sources/git-commit-feature1-unrelated.tape
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
Type "vim .data" Enter Sleep 1 | ||
Type "2Gi" Sleep 0.25 | ||
Type "UNRELATED " Sleep 1 | ||
Escape | ||
Type "ZZ" Sleep 1 | ||
|
||
Type "git add -p" Enter Sleep 3 | ||
Type "y" Sleep 1 Enter Sleep 1 |