Re: [Nbd] [PATCH] Add "temporary" option, and ability to create files.

[Alex Bligh <alex@...872...>]

--On 22 June 2011 14:43:03 +0200 Wouter Verhelst <w@...112...> wrote:

> I'm not sure, by my guess is that that's because you pushed a single
> commit to a branch, which just happened to apply cleanly to that branch
> without issues; apparently you didn't push the branch to make it the
> same as on your local system. Not what you want.
>
> It probably also means you don't have a --mirror branch on your
> git.alex.org.uk server. That's not strictly necessary, but it would
> avoid this kind of issue (although it does make it impossible to have
> 'private' branches that exist only on your local hard disk).

It was my own stupidity. I couldn't get git rebase to work as
I didn't realise that when you took my commits manually, they
don't end up with the same commit identifier, so it thought they
were separate commits and tried to reapply. The checkout head
thing doesn't work, as that creates some weird local branch that is
not the one git.alex.org.uk is configured to receive.

But I've now fixed it, and git.alex.org.uk now looks like your
repo, but for the temporary file patch at the top. Which you
may or may not want to take :-)

--
Alex Bligh