android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stm: update README.md with options for recent gits

Browse Source 
proposed git command options for merging and rebasing
operations are outdated by newer git versions:
here proposed commands are updated accordingly

Signed-off-by: Matteo Dameno <matteo.dameno@st.com>
Change-Id: I7afd20e6c5dbb498442e9cf90fb1b6bac6464f0e
Reviewed-on: https://gerrit.st.com/c/linuxandroidopen/stm-ldd-iio/+/270887
Tested-by: CITOOLS <MDG-smet-aci-reviews@list.st.com>
Reviewed-by: Denis CIOCCA <denis.ciocca@st.com>
Reviewed-by: Mario TESI <mario.tesi@st.com>
This commit is contained in:
Matteo Dameno 2022-10-13 19:47:29 +02:00 committed by Matteo DAMENO
parent 2f2c81d99f
commit 04bf08f9a6
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
README.md
View File

@ -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 \