Re: rebase, file permissions and removed file
- From
Pascal Obry <pascal@obry.net>
- Date
- Oct 27, 2008, 15:09 UTC
- Message-ID
- <a2633edd0810270809w7fec93b2rc314cc025f41d41f@mail.gmail.com>
- In-Reply-To
- <4905D276.9020308@viscovery.net>
On Mon, Oct 27, 2008 at 3:38 PM, Johannes Sixt <j.sixt@viscovery.net> wrote:
Show 5 quoted lines
> Since you don't have any content to lose, you can always just > > $ touch file1 > $ git add file1 > $ git rm file1
Does not work:
$ git rebase --continue Applying: Fix perm file1 No changes - did you forget to use 'git add'?
When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort".
The only solution I found is to abort the rebase, edit my topic branch (fixperms in this example) to remove file1 from the commit and redo the rebase... Not that simple especially since there was many other commits on my topic branch.
-- --|------------------------------------------------------ --| Pascal Obry Team-Ada Member --| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE --|------------------------------------------------------ --| http://www.obry.net --| "The best way to travel is by means of imagination" --| --| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595