[LLVMdev] git Status

[David A. Greene]

Tobias Grosser <tobias at grosser.es> writes:

>> Sending Patches for Review
>> --------------------------
>>
>> git includes a whole set of tools for managing the patch review
>> process.  We kick things off with git format-patch:
>>
>> git format-patch -o $HOME/patches/ifconvert --thread --src-prefix=old/ \
>>                   --dst-prefix=new/ --cover-letter HEAD~1..HEAD
>
> I personally dislike typing all the time such a long command
> line. Maybe you can also point out, how to configure this in
> .git/config.

Good idea.

>> [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.

>> 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?

> -------------------
> For the typical case of editing your patches a bit, use git rebase -i:
>
> Let's assume you have the following two patches in your queue:
>
> $ git log --oneline
> ef723 Start if conversion work
> 443de Middle of if conversion work, something interesting to commit
>
> To fix some problems with commit 'Start if conversion work', add your
> fixes directly to the working copy and commit them as new changeset
> Fixes for: Start if conversion work'.

Ah, that's a another good example I should add to the document.

Thanks!

                            -Dave