Similar situation and solution.
Maybe someone who comes here from searching that will be useful.
Honestly to deal in the wilds of the terms "satelite", "unstage" and master the techniques of jumping through the commits did not want.
Do when you do
git checkout identificationdata
further commits turned out to be molded to it out any branches, even if you have done the checkout on your last commit (for example, I expected that returning to it, everything really back to normal).
These commits are hanging as it were in naimenovanie new branch, in a kind of meritocrat space. And of course all attempts to push the changes with
git push origin vacay
will not give you expected result. With your line all right, and with the changes too, just all the commits that were made after your manipulations with setbacks it is necessary to pour into your main branch.
The most intuitive and easy way to preimenovati current state (the current chain of commits) a new branch.
git checkout-b tempname
Then return to your home branch
git checkout vacay
and to merge changes from the branch
git merge tempname
(because in the Gita all you are is change, the branch tempname - this is only your changes, hence the intuitiveness of the method).
it only remains to remove the temporary branch, so as not to clog REP.
git branch-d tempname
And you can push.
I want to go back to a certain place and now this. Why is this so complicated?
Find more questions by tags Git
Because when you were created, you were standing there on the master. What do you mean "was"? This means that the HEAD pointer was equal to the index master. If you go to any commit (using checkout), it will set the pointer HEAD and tell you that you are cut off from branches. But when you're standing there, create a branch, it will be created there, where there is HEAD - directly on the commit. - Ramon.Stracke commented on July 8th 19 at 12:18