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

feat(git): add git rebase command option notes

Browse source
This commit is contained in:
Marcello 2023-09-11 21:51:25 +02:00
parent cbee07cbcb
commit 3927f011d7
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/tools/git/git.md
View file

@ -233,7 +233,7 @@ It's generally recommended creating annotated tags so it's possible to have all
`git cherry-pick <commit>^..<commit>`: bring in a range of commits from another branch (first included)
`git cherry-pick <commit>..<commit>`: bring in a range of commits from another branch (first excluded)
### Undo & [Rewriting History](https://www.themoderncoder.com/rewriting-git-history/)
### Undo & Rewriting History
`git rm -r --cached <file>`: remove a file from being tracked
`git commit --amend`: replace last commit by creating a new one (can add files or rewrite commit message)
@ -252,8 +252,11 @@ It's generally recommended creating annotated tags so it's possible to have all
`git restore --source <commit> <file>`: revert file to commit version
`git restore <deleted-file>`: recover deleted file if previously committed
`git rebase -i`: modify (reword, edit, drop, squash, merge, ...) current branch commits
`git rebase -i HEAD~<n>`: modify (reword, edit, drop, squash, merge, ...) *n* commits
`git rebase -i <commit>`: modify (reword, edit, drop, squash, merge, ...) *from* commit to latest
`git rebase --autostash`: automatically create a temporary stash entry before rebasing
`git rebase --autosquash`: automatically apply "squash!" or "fixup!" or "amend!" commits
> **WARN**: Changing history can have nasty side effects