diff --git a/Useful-Git-commands.md b/Useful-Git-commands.md
index 71d6389..ca3dcee 100644
--- a/Useful-Git-commands.md
+++ b/Useful-Git-commands.md
@@ -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