I had lots of changes in my local git fork, I do:
git add -A
git commit -m "commit message"
- pull changes from upstream master
- rebase
git push
to my origin
Now It happens that there are several other commits (from others) between my previous commit and my new commit.
I want to see all the changes done by me in my new commit and work on it. So, I do
git reset --soft <my previous commit>
It shows files modified by me and also by others.
Question:
- What would be the way to see files modified only by me?
- And then the files are shown as modified, is it possible to unstage them? I want to see the changes when I do
git diff
.
You are making things so complex. Instead of soft reset, simply use
git diff
and pass your commit and the one before to see what has been changed:Where xxxxxx is the first and yyyyyy is the second commit hash values. To get the commit hash value use
git reflog
.More info here.
UPDATE:
As suggested in comments, you can also use
git difftool xxxxxx yyyyyy
for a visual diff.