Skip to content

Commit

Permalink
solve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@lwaekfjlk
lwaekfjlk committed Mar 14, 2024
1 parent bcd03f1 commit 801c440
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion run_git.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ for COMMIT in $COMMITS; do
export GIT_AUTHOR_EMAIL="$AUTHOR_EMAIL"

# Cherry-pick the commit without adding any signatures
git cherry-pick -x --signoff=false $COMMIT
git cherry-pick -x --signoff $COMMIT

# Reset the GIT_COMMITTER_DATE to avoid affecting subsequent git operations
unset GIT_COMMITTER_DATE
Expand Down

0 comments on commit 801c440

Please sign in to comment.