mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-08-10 15:47:54 +02:00
Updated Useful Git commands (markdown)
@ -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.
|
`--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
|
### Revert
|
||||||
|
Reference in New Issue
Block a user