beenull/linux-surface
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

pkd/debian: Use 'git am -3' to fix some conflicts

Browse source
This commit is contained in:
Maximilian Luz 2021-07-21 03:44:15 +02:00
parent 9bfb27f3e8
commit 513588effe
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/debian.yml vendored
View file

@ -49,7 +49,7 @@ jobs:
# apply surface build/packaging patches
for PATCH in ../*.patch; do
git am ${PATCH}
git am -3 ${PATCH}
done
git add .
@ -57,7 +57,7 @@ jobs:
# apply surface patches
for PATCH in ../../../../patches/${KERNEL_VERSION%.*}/*.patch; do
git am < ${PATCH}
git am -3 ${PATCH}
done
git add .

4
.github/workflows/debian_lts.yml vendored
View file

@ -49,7 +49,7 @@ jobs:
# apply surface build/packaging patches
for PATCH in ../*.patch; do
git am ${PATCH}
git am -3 ${PATCH}
done
git add .
@ -57,7 +57,7 @@ jobs:
# apply surface patches
for PATCH in ../../../../patches/${KERNEL_VERSION%.*}/*.patch; do
git am ${PATCH}
git am -3 ${PATCH}
done
git add .