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

git: refine reabse 'onto' notes

Browse source
This commit is contained in:
Marcello 2024-05-06 10:26:12 +02:00
parent fa53e07972
commit 0907c48653
No known key found for this signature in database
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/misc/git.md
View file

@ -190,7 +190,7 @@ It's generally recommended creating annotated tags so it's possible to have all
`git merge <branch-name>`: merges into current branch
`git merge --continue`: continue previous merge after solving a merge conflict
`git rebase <branch>`: rebase current branch commits onto another branch
`git rebase --onto <commit>`: rebase current branch commits onto another commit
`git rebase --onto <new-base> <old-base>`: rebase a slice of commits from `<old-base>` onto `<new-base>`
`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)