We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent bfe23b9 commit 0b49a5dCopy full SHA for 0b49a5d
src/tools/miri/miri
@@ -121,7 +121,7 @@ toolchain)
121
rustc-pull)
122
cd "$MIRIDIR"
123
git fetch http://localhost:8000/rust-lang/rust.git$JOSH_FILTER.git master
124
- git merge FETCH_HEAD
+ git merge FETCH_HEAD --no-ff -m "Merge from rustc"
125
exit 0
126
;;
127
rustc-push)
src/tools/miri/rust-version
@@ -1 +1 @@
1
-607878d069267e1402ad792c9331b426e4c6d0f9
+b03502b35d111bef0399a66ab3cc765f0802e8ba
0 commit comments