diff options
author | Gabriel Souza Franco | 2019-10-22 09:50:57 +0200 |
---|---|---|
committer | Gabriel Souza Franco | 2019-10-22 09:50:57 +0200 |
commit | 388a59672b76ec73a563c56bf37f0c40907a26bc (patch) | |
tree | 9d02c3d0490ecf44d3cefde7d8b91a657f388ccd | |
parent | bbaad292b20daffda5d86d95a580b62c9a18c40a (diff) | |
download | aur-388a59672b76ec73a563c56bf37f0c40907a26bc.tar.gz |
Do not try to commit cherry-picked changes
-rw-r--r-- | PKGBUILD | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -40,10 +40,9 @@ prepare() { cd "${srcdir}/FreeCAD" if ((${#_backports[@]})); then - git cherry-pick -x -Xours -Xignore-space-change "${_backports[@]}" \ + git cherry-pick -n -x -Xours -Xignore-space-change "${_backports[@]}" \ || true # Kind of a hack, but the last commit does not apply cleanly git rm src/Mod/TechDraw/App/Cosmetic.cpp # Fix file not present in 0.18 - git commit --no-edit fi } |