[llvm-dev] [cfe-dev] Phabricator -> GitHub PRs?
Fangrui Song via llvm-dev
llvm-dev at lists.llvm.org
Fri Sep 11 19:34:13 PDT 2020
On 2020-09-12, Renato Golin via llvm-dev wrote:
>On Fri, 11 Sep 2020 at 23:56, Hubert Tong via llvm-dev <
>llvm-dev at lists.llvm.org> wrote:
>
>> On Fri, Sep 11, 2020 at 3:45 PM Stephen Neuendorffer via llvm-dev <
>>> llvm-dev at lists.llvm.org> wrote:
>>>
>>>> Just to clarify: All the LLVM incubator repositories have "enforce
>>>> linear history" enabled. Neither "Squash and Merge" or "Rebase and Merge"
>>>> results in a Merge commit in the git history.
>>>>
>>> I am not aware of/still have not experienced a case where "Rebase and
>> Merge" retains merge commits.
>>
>
>It does not. We can disable the merge commit on Github settings. Plus, the
>master branch history protection will stop people from merge-commit or
>force-push by hand anyway.
One property of "Squash and merge" is that it will add intermediate
commits as bullet points (`* `). In many cases the merger does not spend
more time cleaning up the description so a commit may look like:
```
RFC: treat small negative λ as 0 for sqrt(::Hermitian) (#35057)
* treat small negative λ as 0 for sqrt(::Hermitian) and log(::Hermitian)
* typo
* added tests, docs; removed rtol argument for log
* don't ask for rtol so close to eps(Float64)
```
The typo and `added tests` messages should probably not be there. The circt commit demonstrates the exact same problem: https://github.com/llvm/circt/commit/9ab7d667f9ad5de06c7986a71ad5e07e19cd55e7
More information about the llvm-dev
mailing list