How can I find all commits that are in one branch but not in another using git?

Question

I\'ve two branches, master and live. Master is the development branch and contains commits that aren\'t ready to go into live.

<

Answer 1

I ended up solving my own problem using a short python script combining git patch-id and git log, the script can be found here https://gist.github.com/4565584

Answer 2

You are very close. The correct command is:

git log --cherry-pick --oneline --no-merges --left-only master...live

from the log manpage:

--left-only, --right-only

List only commits on the respective side of a symmetric range, i.e. only those which would be marked < resp. > by --left-right.

For example, --cherry-pick --right-only A...B omits those commits from B which are in A or are patch-equivalent to a commit in A. In other words, this lists the + commits from git cherry A B. More precisely, --cherry-pick --right-only --no-merges gives the exact list.

Answer 3

git log master ^live --no-merges