git ahead/behind info between master and branch?

user_1391441 0
Viewed 149143

I have created a branch for testing in my local repo (test-branch) which I pushed to Github.

If I go to my Github account and select this test-branch it shows the info:

This branch is 1 commit ahead and 2 commits behind master

My questions are:

  1. How can I display this info locally (ie: a command that shows this on the terminal, rather than having to open Github to see it)?

  2. I know I can see the diffs between branches using:

    git diff master..test-branch

    or using Meld (which I prefer):

    git difftool master..test-branch

    but I was wondering if there's a way to see the ahead and behind commits separately. I.E.: is there a way to show that 1 commit ahead by itself and then those 2 commits behind by themselves?

github git
6 Answers

To get the number of commits ahead of master for your current feature branch you can use the following command:

git rev-list --left-right --count master...$(git branch --show-current)
user_117703930

You can also use awk to make it a little bit prettier:

git rev-list --left-right --count  origin/develop...feature-branch | awk '{print "Behind "$1" - Ahead "$2""}'

You can even make an alias that always fetches origin first and then compares the branches

commit-diff = !"git fetch &> /dev/null && git rev-list --left-right --count"
user_60820320
Related