All geek questions in one place

Git: what did I do before I merged?

I just did a quick merge with a lot of commits in it, and this violated some functions.

(how) Can I find out with whom I was connected before the merger?

+4
source share
1 answer

As noted in the comments, you can use the command to do this git reflog. Reflog creates all the movements of the Git markup pointers. This includes actions such as:

  • Creating new commits in a branch using git commit(or other commands that create new commits like git cherry-pickor others)
  • Reset the latch indicator with git reset
  • Merging another branch with both a quick transition and the usual three-way merge.

, master ,

> git reflog master

, :

e03b939 master@{0}: pull: Fast-forward
fa6a265 master@{1}: commit: Added section on project background
c9957fd master@{2}: commit (merge): Merge branch 'feature/foobar'
9d4e390 master@{3}: pull: Merge made by the 'recursive' strategy.
536c04a master@{4}: commit (merge): Merge remote-tracking branch 'origin/master'
d1cf7ad master@{5}: commit: Fix broken formatting
a0cfc5c master@{6}: pull: Fast-forward
c638351 master@{7}: reset: moving to HEAD^
303307e master@{8}: commit: Add awesome feature
...

master@{0} , master. master@{1} , master, .

reset , git reset:

> git reset --hard fa6a265
+2

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

More articles:


All Articles