How to find last git commit before a merge

by

The quick way to determine commit after merge occured is to use the reflog.

Assuming that last occured operation was a merge, then:

git log HEAD@{1} -1

HEAD@{1} refers to the previous HEAD before the last operation, so you can address it using log and reflog.

git log will show you sequence of the commits in the current branch, so after a merge it always will be a merge commit, and right before it will be commits from the merged branch. git reflog shows the sequence of operations in your repository (for example merge, rebase). As explained in the docs:

Reference logs, or “reflogs”, record when the tips of branches and other references were updated in the local repository. Reflogs are useful in various Git commands, to specify the old value of a reference.

A quick way to do this is to type 

git log --pretty=format:'%h : %s' --graph

then just follow down the graph on the right hand side till you find the merge point. You can also do

git log --pretty=format:'%h : %s' --graph > temp.txt

which puts the output into a file, temp.txt, that which you can open in your editor and use the search facility to look for text like merge.

This approach is useful to answer lots of other questions about the lineage of your latest commit so have put

alias git_graph="git log --pretty=format:'%h : %s' --graph"

in my .bash_profile file so I can just use “`git_log“ to see this information.

More Related Contents:

  1. How do I add files in Git to the path of a former submodule?
  2. Why is it that if you download Git 2.0 from the net, you always get a 1.9.4 installer package?
  3. How to get just one file from another branch?
  4. How to remove unreferenced blobs from my Git repository
  5. Download single files from GitHub
  6. How to create file execute mode permissions in Git on Windows?
  7. How to resolve git error: “Updates were rejected because the tip of your current branch is behind”
  8. How much of a git sha is *generally* considered necessary to uniquely identify a change in a given codebase?
  9. Start ssh-agent on login [closed]
  10. Should I use SVN or Git? [closed]
  11. git stash and apply
  12. Is there a way to lock a branch in GIT
  13. What are the practical consequences of rewriting Git history?
  14. ‘git pull origin mybranch’ leaves local mybranch N commits ahead of origin. Why?
  15. How can I view all the git repositories on my machine?
  16. How do I react to new tags in git hooks?
  17. What are the “loose objects” that the Git GUI refers to?
  18. Is there a way to tell git to only include certain files instead of ignoring certain files?
  19. Clone works, remote push doesn’t. Remote repository over copssh
  20. fatal: The current branch master has no upstream branch
  21. Is it possible to pull just one file in Git?
  22. Using a Jenkins pipeline to checkout multiple git repos into same job
  23. git ignore all files of a certain type, except those in a specific subfolder
  24. How to delete the last n commits on Github and locally?
  25. How do I execute a Git command without being in the repository?
  26. How to apply a Git patch to a file with a different name and path?
  27. Do you ignore a git submodule in your .gitignore or commit it to your repo?
  28. How can I make WinMerge my git mergetool?
  29. Can git permanently ignore a remote branch?
  30. git push to remote repository “Could not read from remote repository”

Leave a Comment