[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git help - previous rebase directory
From: |
Graham Percival |
Subject: |
Re: git help - previous rebase directory |
Date: |
Thu, 9 Jun 2011 20:17:27 +0100 |
User-agent: |
Mutt/1.5.20 (2009-06-14) |
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/
> (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.
> 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.
> 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. At this stage, I
would recommend looking for a tutorial about it online.
Cheers,
- GRaham