git diff only my changes

Question

git diff commit_A commit_B shows me all the differences between A and B

Within the range of commits A..B there are commits --author=me and --author=someone else

Is there a way to get the git diff for my cumulative changes between A and B, excluding changes by others?

I imagine one potential solution would be to parse git log --author=me and "sum" together the diffs for each commit. Another potential idea could be to take the git blame at point B and filter by lines that were changed between A and B.

Context:

Suppose I am working on a large feature over the course of some long period of time. During this work, I make many commits of subfeatures. In order to keep up to date with the latest codebase, git pull creates merge commits with other contributors' contributions. I want to be able to see the cumulative changes I have made so far without seeing everyone else's changes. Assume there are no merge conflicts (we touch different areas of code, but potentially in the same file.

score 1 · Answer 1 · answered Sep 24 '15 at 18:21

Is there a way to get the git diff for my cumulative changes between A and B, excluding changes by others?

Not directly, no.

I imagine one potential solution would be to parse git log --author=me and "sum" together the diffs for each commit.

The same idea, but I think easier to achieve (although I'd expect frequent problems with patches not applying properly): make a temporary branch starting from commit A, cherry-pick every commit you want to keep (yours or theirs) while ignoring the ones you want to skip, then diff the final result against the original. Once satisfied with the diff, discard the temporary branch. Hence:

git checkout -b temp A
for commit in $(git rev-list A..B); do
    if want_commit $commit; then git cherry-pick $commit; fi
done
git diff A
git checkout realbranch; git branch -D temp

(There's no need to name the temporary branch: a detached HEAD will serve as the temporary branch. The above is mainly for illustration.)

I don't think all patches would necessarily apply cleanly – arcyqwerty Sep 24 '15 at 19:48 — arcyqwerty, Sep 24 '15 at 19:48

score 1 · Answer 2 · answered Feb 04 '22 at 17:01

1

Not the same thing but very close:

git --no-pager log --name-only --oneline --author="John"

Here it will list all the commits done by you, and just shows file names.

answered Feb 04 '22 at 17:01

Teoman shipahi

47,454
15
134
158

score -2 · Answer 3 · answered Aug 12 '20 at 15:54

You can do this using branches (From the context it sounds like your branch is not merged into a main branch).

This comment explains it: git diff showing only commits that revision/branch A is ahead of revision/branch B

So if your branch is B that came out of branch A you can run:

git diff A...B

Or simply:

git diff A...

git diff only my changes

3 Answers3