search for: 0f0d0ed1c78

...<http://lists.llvm.org/pipermail/llvm-dev/2019-December/137661.html>. The current plan of action is summarized at <https://github.com/flang-compiler/f18/issues/876>. The result will look a lot like the recent MLIR merge from 24th Dec: <https://github.com/llvm/llvm-project/commits/0f0d0ed1c78>, commit 0f0d0ed1c78 in the llvm-project monorepo. Once it is done I'll mail the list. If you want to coordinate with me, please get in touch. Regards, - Peter

...er/137661.html>. > > > > The current plan of action is summarized at > > <https://github.com/flang-compiler/f18/issues/876>. > > > > The result will look a lot like the recent MLIR merge from 24th Dec: > > <https://github.com/llvm/llvm-project/commits/0f0d0ed1c78>, commit > > 0f0d0ed1c78 in the llvm-project monorepo. > > > > Once it is done I'll mail the list. If you want to coordinate with me, > > please get in touch. > > > > Regards, > > > > - Peter > > __________________________________________...

...gt;. > > The current plan of action is summarized at<https://github.com/flang-compiler/f18/issues/876> <https://github.com/flang-compiler/f18/issues/876>. > > The result will look a lot like the recent MLIR merge from 24th Dec:<https://github.com/llvm/llvm-project/commits/0f0d0ed1c78> <https://github.com/llvm/llvm-project/commits/0f0d0ed1c78>, commit > 0f0d0ed1c78 in the llvm-project monorepo. > > Once it is done I'll mail the list. If you want to coordinate with me, > please get in touch. > > Regards, > > - Peter > ______________________...

I take it from this conversation that we should do a --no-ff merge of the rewritten history. The final history will look like this: [llvm project/master] ---------------------> [empty merge commit]                       \_ 2,700ish commits _/^ This means that `git log --first-parent` will only show the merge commit, and not those from the "initial flang" branch. Currently it