From: Bert Wesarg Date: Fri, 27 Feb 2009 08:40:45 GMT Subject: Re: [TopGit] aborting tg create leafs deleted .top* files in index Message-ID: <36ca99e90902270040g6ae29c69t1d958fda3dfce960@mail.gmail.com> In-Reply-To: <20090227083211.GA10326@pengutronix.de> On Fri, Feb 27, 2009 at 09:32, Uwe Kleine-König wrote: > I have git version 1.5.6.5 and for me your recipe[1] ends in > >        $ git status >        # On branch t/test1 >        nothing to commit (working directory clean) > > With git 1.6.1.3 I can reproduce it though. > > Here comes a git only test case: > >        git init >        touch file >        git add file >        git commit -m 'initial commit' >        git checkout -b next >        echo next > file >        git add file >        git rm -f file >        git checkout master >        git status > > What about the patch below?  It seems git-checkout from 1.6.x merges the > changes done to the newly checked out branch. Thank you very much. It works here as expected. Bert > > Best regards > Uwe