Git: function branch appears in the main branch when I do not merge them

Is there an easy way to find how it merged into a main branch?

I cannot find it in my git reflog or git log, it only fixes the name origin / feature_branch_name, but somehow it also has the name origin / main_branch_name.

I create my branches using

git checkout -b feature_branch_name

I put my branch at the beginning with

git push origin feature_branch_name

and git output was

<hash1>..<hash2> feature_branch_name -> feature_branch_name

The next day I checked our main branch and pulled, and some new files appeared in the main branch when I pulled. Any ideas how I can track this?

+4
source share
1 answer

to find which commits (creates / modifies / destroys) a specific file:

git log --oneline --decorate --all -- THE_NEW_FILE

displays the first line of the commit message and any associated branches / tags.

,

git whatchanged -1 COMMIT_HASH
or
git diff --stat COMMIT_HASH~ COMMIT_HASH

reflog , , . .

git log --oneline -32 
+3

Source: https://habr.com/ru/post/1657540/


All Articles