Displaying 5 results from an estimated 5 matches for "443de".
2011 Aug 23
2
[LLVMdev] git Status
...and
> git add -i are your friends.
>
> For the typical case of editing your patches a bit, use git rebase -i:
>
> git rebase -i HEAD~2
>
> This brings up an editor with a document that looks something like
> this:
>
> pick ef723 Start if conversion work
> pick 443de Middle of if conversion work, something interesting to commit
>
> 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....
2011 Aug 22
0
[LLVMdev] git Status
FlyLanguage <flylanguage at gmail.com> writes:
> 2) Nobody writing up how git should be used with the current llvm
> workflow (which is not going to adapt to an SCM, but the other way
> around, which is understandable.)
Here is a first cut at that. Other git users, please chime in with
suggestions, edits, etc. Non-git users, please ask for clarification
where needed. This is
2011 Aug 19
11
[LLVMdev] git Status
> On Aug 18, 2011, at 10:57 AM, David Greene wrote:
>>
>> Did the project ever come to a decision about making a transition to
>> git? I'm trying to do some longer-term planning and it would be helpful
>> to know what the roadmap is.
It's stuck on:
1) A misunderstanding that global revision numbers are necessary and
that 'git describe' along with
2011 Aug 23
1
[LLVMdev] git Status
...local commits, and only
them. I cannot rewrite upstream history by mistake (which would lead to
weird things afterwards).
> In this case, let's say that the second commit needs some work. We
> edit the control file to do that:
>
> pick ef723 Start if conversion work
> edit 443de Middle of if conversion work, something interesting to commit
It's not the best example: rebase is not needed at all to edit the last
commit. You should edit the first to make the example more relevant.
> git reset --soft HEAD^
> git commit -a -c ORIG_HEAD
That seems to be a rather co...
2011 Aug 23
0
[LLVMdev] git Status
...rked "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 goo...