Updated Useful Git commands (markdown)

Ralf Becker 2023-11-22 17:20:39 +02:00
parent da57d9550d
commit 5fdd62b8ff

@ -35,6 +35,11 @@ git cherry-pick <commit hash>
```
`--no-commit`: this will help if you don't want your cherry-pick be committed right after.
Merge `master` into current branch, making it like copying all files from master, but in an updatable fashion:
```
git merge --no-squash -s recursive -Xtheirs master
```
***
### Revert