From ae290204ed37cf5c485c2106683c4c4f52975bf7 Mon Sep 17 00:00:00 2001 From: ARNik Date: Wed, 5 Jan 2022 04:29:01 +0300 Subject: [PATCH] Commit Ranges --- README.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7ed6ee1..3a786ee 100644 --- a/README.md +++ b/README.md @@ -14,13 +14,13 @@ git reset --soft # resets #3 only git reset (--mixed) # resets #3 and #2 git reset --hard # resets all #3, #2 and #1 ``` -*** +--- ## git rebase ``` git rebase # rebase using commits's hash git rebase -i HEAD~n # interactive rebase for last n commits ``` -*** +--- ## git commit referencing using ^ and ~ ``` ~n # follows straight history in one branch @@ -34,6 +34,14 @@ git log --oneline -1 HEAD~4 git log --oneline -1 HEAD~4^2^ etc... ``` +--- +## Commit Ranges + +``` +git log --oneline range2..range1 # use git log for showing what commits are selected (reverse order) +git cherry-pick --allow-empty (HEAD)..range1 # copy all commits from range1 branch into current that are already merged +git cherry-pick --allow-empty range1 ^range2 # copy all commits that are in range1 but not in range2 +```