From: Pascal Obry Date: Mon, 27 Oct 2008 15:33:22 GMT Subject: Re: rebase, file permissions and removed file Message-ID: In-Reply-To: <4905DC90.6050503@viscovery.net> On Mon, Oct 27, 2008 at 4:21 PM, Johannes Sixt wrote: > Pascal Obry schrieb: >> On Mon, Oct 27, 2008 at 3:38 PM, Johannes Sixt 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! ;) Well, on my side I add to use: $ git rm --cached file1 For the last command. > 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'. No no :) Too easy! I have plenty of other permission changes in my commit that I do not want to loose! Pascal. -- --|------------------------------------------------------ --| 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