From 2d55c0146ee308a0b0c7b5702bcbbea7b7ea1e2a Mon Sep 17 00:00:00 2001 From: Cory Lewis Date: Wed, 22 Nov 2023 09:53:48 -0800 Subject: [PATCH 1/2] Update git-memo.content.md Add additional git commands to git-memo.content.md --- src/tools/git-memo/git-memo.content.md | 27 ++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/tools/git-memo/git-memo.content.md b/src/tools/git-memo/git-memo.content.md index 6783ad86..b3449219 100644 --- a/src/tools/git-memo/git-memo.content.md +++ b/src/tools/git-memo/git-memo.content.md @@ -75,3 +75,30 @@ Renaming the local master branch to main ```shell git branch -m master main ``` + +Checking log graph +```shell +git log --graph +``` + +Checking log graph (merges only) + +```shell +git log --graph --merges +``` + +Tracking down a bad commit using binary search + +```shell +git bisect start +git bisect good 13c988d4f15e06bcdd0b0af290086a3079cdadb0 +git bisect bad ca82a6dff817ec66f44342007202690a93763949 +``` + +Pulling new changes into current branch from mainline + +```shell +git checkout [branchh-name] +git fetch origin [master-branch-name] +git rebase origin/[master-branch-name] +``` From f7256fb42a92484b6f9285764d4825032bba0174 Mon Sep 17 00:00:00 2001 From: Cory Lewis Date: Wed, 22 Nov 2023 09:54:24 -0800 Subject: [PATCH 2/2] Correct minor typo in git-memo.content.md Removed extra "h" from the word branch --- src/tools/git-memo/git-memo.content.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/git-memo/git-memo.content.md b/src/tools/git-memo/git-memo.content.md index b3449219..acbddc74 100644 --- a/src/tools/git-memo/git-memo.content.md +++ b/src/tools/git-memo/git-memo.content.md @@ -98,7 +98,7 @@ git bisect bad ca82a6dff817ec66f44342007202690a93763949 Pulling new changes into current branch from mainline ```shell -git checkout [branchh-name] +git checkout [branch-name] git fetch origin [master-branch-name] git rebase origin/[master-branch-name] ```