[LLVMdev] git Status

[Tobias Grosser]

On 08/23/2011 04:38 PM, David A. Greene wrote:
> Tobias Grosser<tobias at grosser.es>  writes:
>>> [format]
>>>           numbered = auto
>>>           to =llvm-commits at cs.uiuc.edu
>>>           inline = "---------"
>> I believe the current policy is not to inline patches, but to attach
>> them. I believe we should keep following this policy to reduce the
>> changes of this transition.
>
> Ok.  I didn't realize that was policy.

That's what I was told when doing it outherwise. We may reason about 
changing this policy, but should start this discussion after the 
transition to git.

>>> This is a control file you edit to state how git-rebase should work.
>>> There are essentially three commands pick, edit and squash.
>>
>> You missed the one I use most: 'fixup'. I use a different approach to
>> edit patches. Here the text, feel free to add parts of it or to ignore
>> it for the sake of simplicity.
>
> Ah, I didn't know about fixup.  If I'm reading the docs correctly, it's
> simply squash with the commit message for the commits marked "fixup"
> discarded.  Is that right?

Yes.

Cheers
Tobi