Skip to content

Commit 64342b7

Browse files
gretay-jsmshinwell
authored andcommitted
Use 3-way merge for git am and git apply in cherry-pick script (#565)
1 parent 67cbde2 commit 64342b7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

scripts/cherry-pick.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ apply_patches () {
108108
echo "Applying $patchfile"
109109
if [ "$index" -eq 0 ] ; then
110110
# use the commit details of the first patch
111-
git am "$patchfile" "--committer-date-is-author-date"
111+
git am -3 "$patchfile" "--committer-date-is-author-date"
112112
else
113113
# for subsequent patches, just amend the previous commit
114-
git apply "$patchfile" #"--whitespace=fix" ?
114+
git apply -3 "$patchfile" #"--whitespace=fix" ?
115115
git add .
116116
git commit --amend --no-edit
117117
fi

0 commit comments

Comments
 (0)