mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-21 23:43:17 +01:00
Updated Useful Git commands (markdown)
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
|
||||
|
Loading…
Reference in New Issue
Block a user