* [971f835] (HEAD, original_idea) Now working here. Some comment 9
* [692b673] Some comment 8
* [3ebff62] Reverted to original idea. Some comment 7
| * [72ea01d] (ma
If git branch shows that your current branch is original_idea, that wouldn't be a detached HEAD situation.
But in any case, if you want your master to reflect your "current commit" (which is what HEAD means in Git):
git branch -f master HEAD
git checkout master
You would find other alternatives in "How to I “move” my commits from “no branch” to an actual branch?".
The problem with this is that it makes the entire branch currently ending at master disappear.
Then all you need to do is:
original_idea on your schema)That would mean:
git checkout original_idea
git rebase master
git checkout master
git merge original_idea