如何仅将最新合并的提交提交到git中的分支

Question

So I figured out I can get the latest merge to master using git log master --merges -1 . I would like to take this a step further and get only the latest commits from the latest merge to master. How would one do this?

For example let's say I have master , staging , feature1 and feature2 branches. I merge feature1 into staging and then into master . Then I do the same with feature2 afterwards. How do I get that happened between merging feature2 ?

Answer 1

Have you tried the --children flag?

git log master --children --merges -1

or you could try

https://gist.github.com/kohsuke/7590246

Answer 2

git log -1 --merges --pretty=format:"%H" gives you SHA of the the last merge commit.

You can use this SHA to filter the output of git rev-list --all --children and limit the results to commits whose parents are the given SHA1.

COMMIT=`git log -1 --merges --pretty=format:"%H"`
git rev-list --all --children | grep "^${COMMIT}" | cut -f2 -d' '

According to git-rev-list documentation ,

--children Print also the children of the commit (in the form "commit child…").

So grep "^${COMMIT}" will ensure output will be lines that start with last merge commit.

Answer 3

After git log master --merges -1 , review the two parent commits of that merge. Then issue git log <parent1>..<parent2> --right-only --no-merges --format=format:%H to list the commits from the feature2 branch.