diff --git a/contents/apply-diff-file.md b/contents/apply-diff-file.md index c5d73d6..898d1c3 100644 --- a/contents/apply-diff-file.md +++ b/contents/apply-diff-file.md @@ -15,16 +15,10 @@ git apply changes.diff #### Examples - **Apply a diff file of uncommitted changes.** - -```sh git apply changes.diff -``` - **Show what would change if the diff were applied.** - -```sh git apply --stat changes.diff -``` #### Steps diff --git a/contents/apply-patch-with-commit-metadata.md b/contents/apply-patch-with-commit-metadata.md index fb3465c..e9897ef 100644 --- a/contents/apply-patch-with-commit-metadata.md +++ b/contents/apply-patch-with-commit-metadata.md @@ -15,16 +15,10 @@ git am my-changes.patch #### Examples - **Apply a patch file and preserve commit info.** - -```sh git am my-changes.patch -``` - **Apply a patch and add a Signed-off-by line.** - -```sh git am --signoff my-changes.patch -``` #### Steps diff --git a/contents/check-existing-worktrees.md b/contents/check-existing-worktrees.md index 5f0a803..ac4b7eb 100644 --- a/contents/check-existing-worktrees.md +++ b/contents/check-existing-worktrees.md @@ -13,16 +13,10 @@ git worktree list #### Examples - **List all active worktrees.** - -```sh git worktree list -``` - **List worktrees in a machine-readable format.** - -```sh git worktree list --porcelain -``` #### Steps diff --git a/contents/create-a-new-worktree.md b/contents/create-a-new-worktree.md index cb5dd16..a509df7 100644 --- a/contents/create-a-new-worktree.md +++ b/contents/create-a-new-worktree.md @@ -15,16 +15,10 @@ git worktree add #### Examples - **Create a new worktree for the feature branch.** - -```sh git worktree add ../feature-branch feature -``` - **Create a worktree for a hotfix branch.** - -```sh git worktree add ../hotfix hotfix-branch -``` #### Steps diff --git a/contents/create-patch-from-last-commit-s.md b/contents/create-patch-from-last-commit-s.md index 40196fc..f5f253b 100644 --- a/contents/create-patch-from-last-commit-s.md +++ b/contents/create-patch-from-last-commit-s.md @@ -13,28 +13,16 @@ git format-patch HEAD~1 #### Examples - **Create a .patch file for the last commit.** - -```sh git format-patch HEAD~1 -``` - **Create a single patch file for all commits on top of main.** - -```sh git format-patch origin/main..HEAD --stdout > my-changes.patch -``` - **Create patch files for the last two commits.** - -```sh git format-patch -2 -``` - **Create patch files for all commits since main.** - -```sh git format-patch -2 origin/main..HEAD -``` #### Steps diff --git a/contents/create-patch-from-uncommitted-changes.md b/contents/create-patch-from-uncommitted-changes.md index 76741b0..124c554 100644 --- a/contents/create-patch-from-uncommitted-changes.md +++ b/contents/create-patch-from-uncommitted-changes.md @@ -15,16 +15,10 @@ git diff > changes.diff #### Examples - **Create a diff file of uncommitted changes.** - -```sh git diff > changes.diff -``` - **Create a diff file for the last commit.** - -```sh git diff HEAD~1 > last-commit.diff -``` #### Steps diff --git a/contents/delete-local-branches-whose-remote-is-gone-bash.md b/contents/delete-local-branches-whose-remote-is-gone-bash.md index da871b0..ed90468 100644 --- a/contents/delete-local-branches-whose-remote-is-gone-bash.md +++ b/contents/delete-local-branches-whose-remote-is-gone-bash.md @@ -17,16 +17,10 @@ git fetch -p && git branch -vv | grep '\[origin/.*: gone\]' | awk '{print $1}' | #### Examples - **Delete all local branches whose remote is gone.** - -```sh git fetch -p && git branch -vv | grep '\[origin/.*: gone\]' | awk '{print $1}' | xargs -r git branch -d -``` - **Delete only feature branches whose remote is gone.** - -```sh git fetch -p && git branch -vv | grep '\[origin/feature: gone\]' | awk '{print $1}' | xargs -r git branch -d -``` #### Steps diff --git a/contents/delete-local-branches-whose-remote-is-gone-powershell.md b/contents/delete-local-branches-whose-remote-is-gone-powershell.md index 61496fb..6e3d16b 100644 --- a/contents/delete-local-branches-whose-remote-is-gone-powershell.md +++ b/contents/delete-local-branches-whose-remote-is-gone-powershell.md @@ -20,18 +20,12 @@ git branch -vv | ForEach-Object { if ($_ -match '\[.*: gone\]') { $parts = $_.Tr #### Examples - **Delete all local branches whose remote is gone.** - -```sh git fetch -p git branch -vv | ForEach-Object { if ($_ -match '[.*: gone]') { $parts = $_.Trim() -split '\s+'; $branch = $parts[0]; if ($branch -ne '') { git branch -d $branch } } } -``` - **Delete only feature branches whose remote is gone.** - -```sh git fetch -p git branch -vv | ForEach-Object { if ($_ -match '[origin/feature: gone]') { $parts = $_.Trim() -split 's+'; $branch = $parts[0]; if ($branch -ne '') { git branch -d $branch } } } -``` #### Steps diff --git a/contents/git-clean-remove-untracked-files-and-directories.md b/contents/git-clean-remove-untracked-files-and-directories.md index 024404b..05b2bf0 100644 --- a/contents/git-clean-remove-untracked-files-and-directories.md +++ b/contents/git-clean-remove-untracked-files-and-directories.md @@ -26,34 +26,19 @@ git clean #### Examples - **Preview what will be deleted (dry run).** - -```sh git clean -n -d -``` - **Delete all untracked files.** - -```sh git clean -f -``` - **Delete all untracked files and directories.** - -```sh git clean -f -d -``` - **Interactive mode for selective deletion.** - -```sh git clean -i -``` - **Delete untracked and ignored files.** - -```sh git clean -f -x -``` #### Steps diff --git a/contents/git-clone-mirror-repository.md b/contents/git-clone-mirror-repository.md index bc8c20e..71c0723 100644 --- a/contents/git-clone-mirror-repository.md +++ b/contents/git-clone-mirror-repository.md @@ -17,16 +17,10 @@ git clone --mirror https://github.com/example/repo.git #### Examples - **Create a full backup or migration of a repository.** - -```sh git clone --mirror https://github.com/example/repo.git -``` - **Mirror-clone a private repo using SSH.** - -```sh git clone --mirror git@github.com:org/repo.git -``` #### Steps diff --git a/contents/git-init-bare.md b/contents/git-init-bare.md index 28e0ac2..f964af8 100644 --- a/contents/git-init-bare.md +++ b/contents/git-init-bare.md @@ -15,16 +15,10 @@ git init --bare my-repo.git #### Examples - **Create a bare repository for collaboration.** - -```sh git init --bare my-repo.git -``` - **Initialize a bare repo in a custom directory for server hosting.** - -```sh git init --bare /srv/git/project.git -``` #### Steps diff --git a/contents/git-maintenance-start.md b/contents/git-maintenance-start.md index eecbedb..5a7c174 100644 --- a/contents/git-maintenance-start.md +++ b/contents/git-maintenance-start.md @@ -17,16 +17,10 @@ git maintenance start #### Examples - **Enable background maintenance for your repository.** - -```sh git maintenance start -``` - **Run maintenance tasks every hour for more active repos.** - -```sh git maintenance start --schedule=hourly -``` #### Steps diff --git a/contents/git-replace-old-commit-new-commit.md b/contents/git-replace-old-commit-new-commit.md index a75b9c1..fda85ed 100644 --- a/contents/git-replace-old-commit-new-commit.md +++ b/contents/git-replace-old-commit-new-commit.md @@ -15,16 +15,10 @@ git replace abc123 def456 #### Examples - **Temporarily replace commit abc123 with def456.** - -```sh git replace abc123 def456 -``` - **Graft a new parent onto a commit for testing history changes.** - -```sh git replace --graft HEAD~2 HEAD -``` #### Steps diff --git a/contents/git-request-pull.md b/contents/git-request-pull.md index 1ff3ee1..08a6b68 100644 --- a/contents/git-request-pull.md +++ b/contents/git-request-pull.md @@ -20,8 +20,6 @@ git request-pull - **Generates a summary like:** -```sh - ```The following changes since commit 1234567... (main): @@ -41,19 +39,12 @@ for you to fetch changes up to 89abcde... (feature-branch): file2.js | 5 +++++ 2 files changed, 15 insertions(+) ``` -``` - **Generate a pull request message from v1.0 to v1.1.** - -```sh git request-pull v1.0 https://github.com/example/repo.git v1.1 -``` - **Request a pull for a feature branch based on main.** - -```sh git request-pull main https://github.com/example/repo.git feature-branch -``` #### Steps diff --git a/contents/how-to-use-git-push-force-with-lease-safely.md b/contents/how-to-use-git-push-force-with-lease-safely.md index 70f034d..e8bc1dc 100644 --- a/contents/how-to-use-git-push-force-with-lease-safely.md +++ b/contents/how-to-use-git-push-force-with-lease-safely.md @@ -17,16 +17,10 @@ git push --force-with-lease #### Examples - **Safely force-push your changes.** - -```sh git push --force-with-lease -``` - **Force-push a specific branch with lease protection.** - -```sh git push --force-with-lease origin feature-branch -``` #### Steps diff --git a/contents/pull-changes-of-specific-files-from-a-commit.md b/contents/pull-changes-of-specific-files-from-a-commit.md index d5cc217..36030c3 100644 --- a/contents/pull-changes-of-specific-files-from-a-commit.md +++ b/contents/pull-changes-of-specific-files-from-a-commit.md @@ -17,24 +17,15 @@ git checkout -- #### Examples - **Restore file1.txt and file2.txt from the specified commit.** - -```sh git checkout e8ab7f64fdfcc7bdaaed8d96c0ac26dce035663f -- path/to/file1.txt path/to/file2.txt -``` - **Stage, commit, and push the restored files to a new branch.** - -```sh git add path/to/file1.txt path/to/file2.txt git commit -m "Pulled changes for file1.txt and file2.txt from commit e8ab7f64" git push origin revert/productionOrder -``` - **Restore files using the newer 'git restore' command.** - -```sh git restore --source e8ab7f64fdfcc7bdaaed8d96c0ac26dce035663f path/to/file1.txt path/to/file2.txt -``` #### Steps diff --git a/contents/remove-a-worktree.md b/contents/remove-a-worktree.md index 5652833..7f2aee2 100644 --- a/contents/remove-a-worktree.md +++ b/contents/remove-a-worktree.md @@ -15,16 +15,10 @@ git worktree remove #### Examples - **Detach a worktree without deleting the files.** - -```sh git worktree remove ../feature-branch -``` - **Remove a hotfix worktree.** - -```sh git worktree remove ../hotfix -``` #### Steps diff --git a/contents/see-who-last-modified-each-line-blame.md b/contents/see-who-last-modified-each-line-blame.md index 5ab5885..63ce4b7 100644 --- a/contents/see-who-last-modified-each-line-blame.md +++ b/contents/see-who-last-modified-each-line-blame.md @@ -15,16 +15,10 @@ git blame filename.txt #### Examples - **Show the last commit that changed each line of the file.** - -```sh git blame filename.txt -``` - **Blame only lines 10 to 20 of a file.** - -```sh git blame -L 10,20 filename.txt -``` #### Steps diff --git a/contents/show-commit-history-of-a-specific-file.md b/contents/show-commit-history-of-a-specific-file.md index 9bc93c1..925d7d0 100644 --- a/contents/show-commit-history-of-a-specific-file.md +++ b/contents/show-commit-history-of-a-specific-file.md @@ -13,16 +13,10 @@ git log --oneline -- filename.txt #### Examples - **List all commits that modified `filename.txt`.** - -```sh git log --oneline -- filename.txt -``` - **Show commit history for a different file.** - -```sh git log --oneline -- path/to/anotherfile.js -``` #### Steps diff --git a/contents/show-commit-history-with-author-and-date.md b/contents/show-commit-history-with-author-and-date.md index b027e18..ea2fa8a 100644 --- a/contents/show-commit-history-with-author-and-date.md +++ b/contents/show-commit-history-with-author-and-date.md @@ -15,16 +15,10 @@ git log --pretty=format:"%h - %an, %ar : %s" -- filename.txt #### Examples - **Display commit hash, author, relative date, and commit message.** - -```sh git log --pretty=format:"%h - %an, %ar : %s" -- filename.txt -``` - **Show commit hash, short date, author, and message.** - -```sh git log --pretty=format:'%h | %ad | %an | %s' --date=short -- filename.txt -``` #### Steps diff --git a/contents/show-detailed-commit-history-with-changes.md b/contents/show-detailed-commit-history-with-changes.md index c1bea88..57eab1d 100644 --- a/contents/show-detailed-commit-history-with-changes.md +++ b/contents/show-detailed-commit-history-with-changes.md @@ -15,16 +15,10 @@ git log -p -- filename.txt #### Examples - **Show each commit and the actual changes made to `filename.txt`.** - -```sh git log -p -- filename.txt -``` - **Show the last two commits and their changes for a file.** - -```sh git log -p -2 -- filename.txt -``` #### Steps diff --git a/contents/switch-between-worktrees.md b/contents/switch-between-worktrees.md index 49109af..72f2842 100644 --- a/contents/switch-between-worktrees.md +++ b/contents/switch-between-worktrees.md @@ -13,16 +13,10 @@ #### Examples - **Switch to the worktree directory.** - -```sh cd ../feature-branch -``` - **Switch to a hotfix worktree.** - -```sh cd ../hotfix -``` #### Steps diff --git a/contents/use-worktrees-for-temporary-fixes.md b/contents/use-worktrees-for-temporary-fixes.md index f635c66..ca4ec06 100644 --- a/contents/use-worktrees-for-temporary-fixes.md +++ b/contents/use-worktrees-for-temporary-fixes.md @@ -15,16 +15,10 @@ git worktree add ../hotfix hotfix-branch #### Examples - **Quickly apply a fix on another branch without leaving your main branch.** - -```sh git worktree add ../hotfix hotfix-branch -``` - **Create a worktree for a bugfix branch.** - -```sh git worktree add ../bugfix bugfix-branch -``` #### Steps diff --git a/contents/view-and-clean-up-local-git-branches-bash.md b/contents/view-and-clean-up-local-git-branches-bash.md index 1489585..1d943e4 100644 --- a/contents/view-and-clean-up-local-git-branches-bash.md +++ b/contents/view-and-clean-up-local-git-branches-bash.md @@ -12,22 +12,13 @@ #### Examples - **List local branches without a remote connection.** - -```sh git branch -vv | grep -E '^\s*\S+\s+[^\[]+$' -``` - **Delete local branches without remote tracking.** - -```sh git branch -vv | grep -E '^\s*\S+\s+[^\[]+$' | awk '{print $1}' | xargs git branch -D -``` - **List branches whose remote is gone.** - -```sh git branch -vv | grep 'gone' -``` #### Steps diff --git a/contents/view-and-clean-up-local-git-branches-powershell.md b/contents/view-and-clean-up-local-git-branches-powershell.md index bff7c5e..4660de2 100644 --- a/contents/view-and-clean-up-local-git-branches-powershell.md +++ b/contents/view-and-clean-up-local-git-branches-powershell.md @@ -12,22 +12,13 @@ #### Examples - **List local branches without a remote connection.** - -```sh git branch -vv | Select-String -NotMatch "origin/" -``` - **Delete local branches without remote tracking.** - -```sh git branch -vv | Select-String -NotMatch "origin/" | ForEach-Object { $branch = ($_ -split "\s+")[1]; git branch -D $branch } -``` - **List branches whose remote is gone.** - -```sh git branch -vv | Select-String 'gone' -``` #### Steps