m-lamonaca/dev-notes
1
0
Fork 0
mirror of https://github.com/m-lamonaca/dev-notes.git synced 2025-04-05 10:26:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

git: add rebase --root notes
Some checks failed
Deploy to Github Pages / deploy (push) Has been cancelled
Details

Browse source
This commit is contained in:
Marcello 2025-03-18 21:59:00 +01:00
parent d0276b5473
commit 6c59f8261b
Signed by: m-lamonaca
SSH key fingerprint: SHA256:8db8uii6Gweq7TbKixFBioW2T8CbgtyFETyYL3cr3zk
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/misc/git.md
View file

@ -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 merge --continue`: continue previous merge after solving a merge conflict
`git rebase <branch>`: rebase current branch commits onto another branch `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> <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>`: bring in a commit from another branch
`git cherry-pick <commit>..<commit>`: bring in a range of commits from another branch (first excluded) `git cherry-pick <commit>..<commit>`: bring in a range of commits from another branch (first excluded)