Re: git help - previous rebase directory

[Janek Warchoł]

2011/6/9 Graham Percival <address@hidden>:
> On Thu, Jun 09, 2011 at 08:52:49PM +0200, Janek Warchoł wrote:
>> Trevor,
>>
>> 2011/6/9 Trevor Daniels <address@hidden>:
>> > Delete the rebase-apply directory.
>>
>> Inside lilypond-git? There is no such directory!
>
> It's inside .git/

Ah, ok.

>> (it doesn't show when i call 'ls' from within lilypond-git, and when i
>> try to 'cd rebase-apply' it also throws an error)
>
> Yes, the .git directory is hidden.  Add the dot.

I figured this out :)

>> Everything begins when i call 'git am *' from within lilypond-git (i
>> suppose this should result in applying all patches that are inside
>> lilypond-git to currently checked-out branch) - it says
>>   Applying: <patch name>
>>   Patch is empty.  Was it split wrong?
>
> Try
>  git am 00*
> instead, assuming that your patches are called
> 0001-blah-blah.patch 0002-blah-blah.patch 0003-blah-blah.patch etc.

It works, great!

>> However, i'd like to know if 'git am *' could be fixed (or how should
>> it be handled properly) - it could save me a lot of typing.
>
> I think you've misunderstood how git am works.

Almost certainly i did ;)

> Cheers,
> - GRaham

Thanks,
- JAnek
;)