diff --git a/README.md b/README.md
index a17e992b30ba..28b95dc6d412 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ There are now two ways to integrate the drivers code into the kernel target bran
 Merge the stmems_iio_github/master with your target kernel source branch (i.e branch linux-5.4.y):
 
 ```bash
-git merge --no-fork-point \
+git merge --allow-unrelated-histories \
           linux-5.4.y \
           stmems_iio_github/master
 ```
@@ -29,6 +29,20 @@ git merge --no-fork-point \
 ### rebase
 Rebase the stmems_iio_github/master on top of your target kernel source branch (i.e branch linux-5.4.y):
 
+```bash
+git rebase --no-fork-point \
+           linux-5.4.y \
+           stmems_iio_github/master
+```
+
+Note: older git versions (i.e.: 2.7.4) would require to use sligthly different options:
+
+```bash
+git merge --no-fork-point \
+          linux-5.4.y \
+          stmems_iio_github/master
+```
+
 ```bash
 git rebase -Xno-renames \
            --no-fork-point \