From: Johannes Sixt <j.sixt@viscovery.net>
To: Pascal Obry <pascal@obry.net>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: rebase, file permissions and removed file
Date: Mon, 27 Oct 2008 16:21:52 +0100 [thread overview]
Message-ID: <4905DC90.6050503@viscovery.net> (raw)
In-Reply-To: <a2633edd0810270809w7fec93b2rc314cc025f41d41f@mail.gmail.com>
Pascal Obry schrieb:
> 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
next prev parent reply other threads:[~2008-10-27 15:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-27 14:02 rebase, file permissions and removed file Pascal Obry
2008-10-27 14:38 ` Johannes Sixt
2008-10-27 15:09 ` Pascal Obry
2008-10-27 15:21 ` Johannes Sixt [this message]
2008-10-27 15:33 ` Pascal Obry
2008-10-27 16:39 ` Samuel Tardieu
2008-10-27 17:12 ` Pascal Obry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4905DC90.6050503@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=pascal@obry.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).