diff --git a/pages/fix-your-mistakes.md b/pages/fix-your-mistakes.md index ac0b640..46d8945 100644 --- a/pages/fix-your-mistakes.md +++ b/pages/fix-your-mistakes.md @@ -32,6 +32,15 @@ git commit --amend --no-edit +--- +layout: full +preload: false +--- + + + --- layout: image-right image: https://images.unsplash.com/photo-1591014827159-2e158ceac55d @@ -48,6 +57,15 @@ git add -p git commit --amend --no-edit ``` +--- +layout: full +preload: false +--- + + + --- layout: image-right image: https://images.unsplash.com/photo-1577594829182-ff8eb109760e @@ -72,3 +90,12 @@ git commit Use this method when the branch is shared with other users and the previous commit has already been pushed. + +--- +layout: full +preload: false +--- + + diff --git a/public/videos/fix-your-mistakes-amend.webm b/public/videos/fix-your-mistakes-amend.webm new file mode 100644 index 0000000..8b7007c --- /dev/null +++ b/public/videos/fix-your-mistakes-amend.webm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2594e6247bb25ec4d0a3505295cb7b067bec5d27ea7f1524319122a03cbd518d +size 230300 diff --git a/public/videos/fix-your-mistakes-commit.webm b/public/videos/fix-your-mistakes-commit.webm new file mode 100644 index 0000000..c0a79dd --- /dev/null +++ b/public/videos/fix-your-mistakes-commit.webm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32eb7f62c6d21979cca5717d0cebd527750eca8197de30de5006bec8b58e7896 +size 371304 diff --git a/public/videos/fix-your-mistakes-restore.webm b/public/videos/fix-your-mistakes-restore.webm new file mode 100644 index 0000000..fd6747f --- /dev/null +++ b/public/videos/fix-your-mistakes-restore.webm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cdd4bb4cf77751b347c94c71ecd3314a9a562c49f34bcbc433267f1a3417fa3d +size 550706 diff --git a/scripts/video/tapes/fix-your-mistakes-amend.tape b/scripts/video/tapes/fix-your-mistakes-amend.tape new file mode 100644 index 0000000..ffe565f --- /dev/null +++ b/scripts/video/tapes/fix-your-mistakes-amend.tape @@ -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 diff --git a/scripts/video/tapes/fix-your-mistakes-commit.tape b/scripts/video/tapes/fix-your-mistakes-commit.tape new file mode 100644 index 0000000..4598807 --- /dev/null +++ b/scripts/video/tapes/fix-your-mistakes-commit.tape @@ -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 diff --git a/scripts/video/tapes/fix-your-mistakes-restore.tape b/scripts/video/tapes/fix-your-mistakes-restore.tape new file mode 100644 index 0000000..1e40fe5 --- /dev/null +++ b/scripts/video/tapes/fix-your-mistakes-restore.tape @@ -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 diff --git a/scripts/video/tapes/sources/git-commit-feature1-improve.tape b/scripts/video/tapes/sources/git-commit-feature1-improve.tape new file mode 100644 index 0000000..86b1a09 --- /dev/null +++ b/scripts/video/tapes/sources/git-commit-feature1-improve.tape @@ -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 diff --git a/scripts/video/tapes/sources/git-commit-feature1-unrelated.tape b/scripts/video/tapes/sources/git-commit-feature1-unrelated.tape new file mode 100644 index 0000000..5a90246 --- /dev/null +++ b/scripts/video/tapes/sources/git-commit-feature1-unrelated.tape @@ -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