diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/automerge7.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/automerge7.sh b/scripts/automerge7.sh index 8f8ed9a785..d64f98a185 100755 --- a/scripts/automerge7.sh +++ b/scripts/automerge7.sh @@ -76,9 +76,12 @@ do maybe_commit_and_push $pendingCommit pendingCommit= echo - echo "Doing a no-op merge for $commit because of Merge: no" + echo "Doing a no-op merge because of Merge: no for $commit" + git log -n 1 --format=%B $commit + echo # Do a no-op merge git merge $commit -s ours + git commit --amend --no-edit pushMerged elif [ "$mergeDirective" == "manual" ] then |