On Mon, Nov 11, 2013 at 1:17 AM, Tommaso Cucinotta <tomm...@lyx.org> wrote:
> On 10/11/13 23:51, Tommaso Cucinotta wrote: > > Any hint as to how to restore a sane environment (branch) :-) ? > > looking at > > > http://git.lyx.org/?p=developers/tommaso/lyx.git;a=shortlog;h=refs/heads/features/chat > > it seems to me that > 1) master on the development/tommaso repo is NOT advancing > 2) patches from lyx trunk (origin/master) are inter-spacing with > commits for the feature branch > > regarding 1), I tried to configure a local branch "tommaso/master" with > > [branch "tommaso/master"] > remote = tommaso > merge = refs/heads/features/chat > > but it doesn't work, or at least when I try to checkout this branch I get > the > > You are in 'detached HEAD' state. You can look around, make experimental > changes and commit them, and you can discard any commits you make in this > state without impacting any branches by performing another checkout. > > which sounds to me as wrong. > > AFAICU, ideally we should keep: > a) tommaso/master "copying" (replicating) origin/master > b) tommaso/features/chat adding only patches on top of tommaso/master, > which is identical to origin/master thanks to a) > > Again, magic hints/spells to cast :D ? > > In your local repository, there is a branch master that tracks origin/master. Now, you can just do: $ git push tommaso master 'git push' without explicitly naming the branch was supposed to push all branches with matching names to the upstream repository. This behaviour changed (but I do not remember in which version) to only pushing the current branch. Further, more important is that the commits from master that appear in your feature branch are actually copies of those in master. They have a different sha-1. I've no clue how you did this,but that is wrong. If you want to restore a proper feature branch, you might want to rebase the feature branch onto master. Make sure all the ghost commits are gone, and after that maker sure you don't rebase unnecessarily. Vincent
