git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: rebase, file permissions and removed file

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Oct 27, 2008, 15:21 UTC
Message-ID
<4905DC90.6050503@viscovery.net>
In-Reply-To
<a2633edd0810270809w7fec93b2rc314cc025f41d41f@mail.gmail.com>
Pascal Obry schrieb:
Show 8 quoted lines
> On Mon, Oct 27, 2008 at 3:38 PM, Johannes Sixt <j.sixt@viscovery.net> wrote:
>> Since you don't have any content to lose, you can always just
>>
>>  $ touch file1
>>  $ git add file1
>>  $ git rm file1
> 
> Does not work:
Yes, it did! ;)
> $ git rebase --continue
> Applying: Fix perm file1
> No changes - did you forget to use 'git add'?

This is an entirely different matter. My interpretation is that the permission change of file1 was the only change in this commit. Since this is no longer needed, you should run 'git rebase --skip'.

-- Hannes
Previous: Pascal ObryNext: Pascal Obry
Message 4 of 7 in “rebase, file permissions and removed file”
  1. Pascal ObryOct 27, 2008
  2. Johannes SixtOct 27, 2008
  3. Pascal ObryOct 27, 2008
  4. Johannes SixtOct 27, 2008
  5. Pascal ObryOct 27, 2008
  6. Samuel TardieuOct 27, 2008
  7. Pascal ObryOct 27, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.