STMicroelectronics / st-mems-android-linux-drivers-iio

stm mems iio drivers for Android and Linux platforms.
GNU General Public License v2.0
23 stars 1 forks source link

git merge --no-fork-point is unknown option #2

Closed MarkusDost closed 1 year ago

MarkusDost commented 1 year ago

In the README.md it is stated, that the driver code can be merged with the target kernel source with

git merge --no-fork-point linux-5.4.y stmems_iio_github/master

The command git merge doesn't know the option --no-fork-point (https://git-scm.com/docs/git-merge)

ciocca-d commented 1 year ago

While most of the git parameters do not change, some does. The git version you are using (probably) uses the option --allow-unrelated-histories for achieving the same.

git merge --allow-unrelated-histories linux-5.4.y stmems_iio_github/master