git ahead/behind info between master and branch?

by

Part 1

As an answer on your question 1, here’s a trick I found to compare two branches and show how many commits each branch is ahead of the other (a more general answer on your question 1):

For local branches:
git rev-list --left-right --count master...test-branch

For remote branches:
git rev-list --left-right --count origin/master...origin/test-branch

This gives output like the following:

2 1

This output means: “Compared to master, test-branch is 1 commit ahead and 2 commits behind.”

You can also compare local branches with remote branches, e.g. origin/master...master to find out how many commits a local branch (here master) is ahead/behind its remote counterpart.

Part 2

To answer the second part of your question, the solution depends on what exactly you want to achieve.

To view commits

In order to have git rev-list return the exact list of commits unique on either side, replace the --count argument with something like --pretty=oneline, making the complete command to execute:

git rev-list --left-right --pretty=oneline master...test-branch

This will generate output like this:

<bba27b56ad7072e281d529d4845e4edf877eb7d7 unique commit 2 on master
<dad0b69ec50ea57b076bfecabf2cc7c8a652bb6f unique commit 1 on master
>4bfad52fbcf0e60d78d06661d5c06b59c98ac8fd unique commit 1 on test-branch

Here every commit sha is preceded by < or > to indicate which branch it can be found on (left or right, here master or test-branch respectively).

To view code

If you want to view a diff of all new commits only found on either branch, you’ll need to do this in two steps:

  1. define the most recent common ancestor
$ git merge-base master test-branch
c22faff7468d6d5caef217ac6b82f3ed95e9d902
  1. diff either branch to the commit sha obtained above (short format will usually do)

To show the diff of all commits only found on master

git diff c22faff7..master

To show the diff of all commits only found test-branch

git diff c22faff7..test-branch

More Related Contents:

  1. How to determine the URL that a local Git repository was originally cloned from?
  2. How to remove file from Git history?
  3. SSL certificate rejected trying to access GitHub over HTTPS behind firewall
  4. Git: Could not resolve host github.com error while cloning remote repository in git
  5. Git Init in home directory – now unable to commit changes
  6. Does github remember commit IDs?
  7. Is it possible to include a file in your .gitconfig
  8. Git fails when pushing commit to github
  9. What is .gitignore?
  10. git:// protocol blocked by company, how can I get around that?
  11. Error pushing to GitHub – insufficient permission for adding an object to repository database
  12. Git push: “fatal ‘origin’ does not appear to be a git repository – fatal Could not read from remote repository.”
  13. Trying to git pull with error: cannot open .git/FETCH_HEAD: Permission denied
  14. Git rebase – commit select in fork-point mode
  15. After git push origin main, nothing happens
  16. github: No supported authentication methods available
  17. Git asks for username every time I push
  18. How do I add files and folders into GitHub repos?
  19. With GitHub how do I push all branches when adding an existing repo?
  20. Git pushing to remote GitHub repository as wrong user
  21. How to sync with a remote Git repository?
  22. Git push failed, “Non-fast forward updates were rejected”
  23. git clone hangs forever on github
  24. Push and pull my conda environment using git
  25. how to log out of one Github account and use another account?
  26. Git: Set local user.name and user.email different for each repo
  27. github: server certificate verification failed
  28. git export from github remote repository
  29. Do GitHub and GitLab support git clone’s –filter parameter?
  30. Why does ‘git commit’ not save my changes?

Leave a Comment