From b4d9570d3151ccaba849bac69a94d9c5c64dfb84 Mon Sep 17 00:00:00 2001 From: Marcello Lamonaca <marcello@lamonaca.eu> Date: Tue, 18 Mar 2025 21:59:00 +0100 Subject: [PATCH] git: add `reabse --root` notes --- docs/misc/git.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/misc/git.md b/docs/misc/git.md index 7430b41..9e80cfa 100644 --- a/docs/misc/git.md +++ b/docs/misc/git.md @@ -187,6 +187,7 @@ It's generally recommended creating annotated tags so it's possible to have all `git merge --continue`: continue previous merge after solving a merge conflict `git rebase <branch>`: rebase current branch commits onto another branch `git rebase --onto <new-base> <old-base>`: rebase a slice of commits from `<old-base>` onto `<new-base>` +`git rebase --onto <new-base> --root <old-base>`: rebase a slice of commits from `<old-base>` onto `<new-base>`, including the root commit `git cherry-pick <commit>`: bring in a commit from another branch `git cherry-pick <commit>..<commit>`: bring in a range of commits from another branch (first excluded)