~/git via 🐍 v3.8.5
❯ mkdir git-cherry-pick-learn
~/git via 🐍 v3.8.5
❯ cd git-cherry-pick-learn
~/git/git-cherry-pick-learn
❯ git init
Initialized empty Git repository in /home/walkews/git/git-cherry-pick-learn/.git/
git-cherry-pick-learn on main
❯ touch readme.md
git-cherry-pick-learn on main [?]
❯ git status
On branch main
No commits yet
Untracked files:
(use "git add <file>..." to include in what will be committed)
readme.md
nothing added to commit but untracked files present (use "git add" to track)
git-cherry-pick-learn on main [?]
❯ git add .
git-cherry-pick-learn on main [+]
❯ git commit -m "init readme"
[main (root-commit) ebd1ff2] init readme
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 readme.md
git-cherry-pick-learn on main
❯ echo "Learn Cherry Pick"
Learn Cherry Pick
git-cherry-pick-learn on main
❯ git add .
git-cherry-pick-learn on main
❯ git commit -m "add title
git-cherry-pick-learn on main
❯ echo "# Learn Cherry Pick" > readme.md
git-cherry-pick-learn on main [!]
❯ git add .
git-cherry-pick-learn on main [+]
❯ git diff
git-cherry-pick-learn on main [+]
❯ git diff --staged
diff --git a/readme.md b/readme.md
index e69de29..3490cef 100644
--- a/readme.md
+++ b/readme.md
@@ -0,0 +1 @@
+# Learn Cherry Pick
git-cherry-pick-learn on main [+]
❯ git commit -m "add title"
[main 148264d] add title
1 file changed, 1 insertion(+)
git-cherry-pick-learn on main
❯ git checkout -b trash-branch
Switched to a new branch 'trash-branch'
git-cherry-pick-learn on trash-branch
❯ echo >> readme.md
git-cherry-pick-learn on trash-branch [!]
❯ echo >> readme.md
git-cherry-pick-learn on trash-branch [!]
❯ echo >> "Cherry Pick is amazing"
git-cherry-pick-learn on trash-branch [!?]
❯ cat readme.md
───────┬────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
│ File: readme.md
───────┼────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
1 │ # Learn Cherry Pick
2 + │
3 + │
───────┴────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
git-cherry-pick-learn on trash-branch [!?]
❯ echo "Cherry Pick is amazing" >>
git-cherry-pick-learn on trash-branch [!?]
❯ git commit -m "add whitespace"
On branch trash-branch
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: readme.md
Untracked files:
(use "git add <file>..." to include in what will be committed)
Cherry Pick is amazing
no changes added to commit (use "git add" and/or "git commit -a")
git-cherry-pick-learn on trash-branch [!?]
❯ git add .
git-cherry-pick-learn on trash-branch [+]
❯ git commit -m "add whitespace"
[trash-branch 94f734b] add whitespace
2 files changed, 3 insertions(+)
create mode 100644 Cherry Pick is amazing
git-cherry-pick-learn on trash-branch
❯ echo "TRASH" >> readme.md
git-cherry-pick-learn on trash-branch [!]
❯ git add .
git-cherry-pick-learn on trash-branch [+]
❯ git commit -m "add trash"
[trash-branch ec43879] add trash
1 file changed, 1 insertion(+)
git-cherry-pick-learn on trash-branch
❯ echo "Cherry Pick is Amazing" >> readme.md
git-cherry-pick-learn on trash-branch [!]
❯ git commit -m "add cherry pick is amazing"
On branch trash-branch
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: readme.md
no changes added to commit (use "git add" and/or "git commit -a")
git-cherry-pick-learn on trash-branch [!]
❯ git add .
git-cherry-pick-learn on trash-branch [+]
❯ git commit -m "add cherry pick is amazing"
[trash-branch 6691a34] add cherry pick is amazing
1 file changed, 1 insertion(+)
git-cherry-pick-learn on trash-branch
❯ cat readme.md
───────┬────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
│ File: readme.md
───────┼────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
1 │ # Learn Cherry Pick
2 │
3 │
4 │ TRASH
5 │ Cherry Pick is Amazing
───────┴────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
git-cherry-pick-learn on trash-branch
❯ git log
commit 6691a343e0ba35d0700c49ec09a99fa8f1f385b9 (HEAD -> trash-branch)
Author: Waylon Walker <[email protected]>
Date: Thu May 13 08:54:58 2021 -0500
add cherry pick is amazing
commit ec438790af36c23aef8eee2122f0dda95313496b
Author: Waylon Walker <[email protected]>
Date: Thu May 13 08:54:07 2021 -0500
add trash
commit 94f734b1adcee0f503c818c0f6bc9da97a0066e2
Author: Waylon Walker <[email protected]>
Date: Thu May 13 08:50:35 2021 -0500
add whitespace
commit 148264da5641033caa537727c6d5199068d58a4d (main)
Author: Waylon Walker <[email protected]>
Date: Thu May 13 08:48:58 2021 -0500
add title
commit ebd1ff22493d860e001f2b96ec948684d496355b
Author: Waylon Walker <[email protected]>
Date: Thu May 13 08:47:10 2021 -0500
init readme
git-cherry-pick-learn on trash-branch
❯ git checkout main
Switched to branch 'main'
git-cherry-pick-learn on main
❯ cat readme.md
───────┬────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
│ File: readme.md
───────┼────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
1 │ # Learn Cherry Pick
───────┴────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
