Return a separate HEAD to the master branch

I use gerrit at my work, and this requires using rebase instead of commits. Today I checked the previous commit using its hash value, and when I ran the git branch command, I was informed that I was not in the branch. I assume this is a separate chapter? In any case, I messed up my master branch and the console printed

Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...

Where does the “triangular merger” come from in this situation? And was HEAD still disconnected after reinstallation (given the assertion of the "base tree")? Thank.

+3
source share
2 answers

Yes "no branch" means a single head

Database update comes from execution

git merge-base <yourrevision> master

( , , ), .

HEAD, IIRC. ( --onto --root), . , rebase, , , .

+1

, :

, , " " :

$ vi main.c
$ git add main.c
$ git rebase --continue

.

0

All Articles