Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

If [commit] is the merge commit for the feature, then this should work:

    git show [commit]^1..[commit]
The ^1 incantation means "first parent", so in the feature branch style I'm describing, this would show the changes on all of the commits for the feature merged at [commit]. You can use `git diff` instead of `show` in the same way, if you just want the cumulative diff.

It seems to work on the repository I've been contributing to, as it shows each of the commits that were part of the feature branch. The merge commit itself is empty, as desired, avoiding the up-thread concern of unreviewed auto-merged code.



Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: