I have a branch called topic1 that is based on 'master'. For a
particular file in my topic branch, I want to revert some changes by
using my diff tool. I do this by comparing the original revision of
the file with HEAD like so:

$ git difftool $(git merge-base topic1 master) HEAD -- Path/SourceFile.cpp

When I make changes to the right side (HEAD) through my diff tool, and
exit, the changes aren't picked up and applied to my working copy.
Since I'm modifying HEAD, I think it should carry over the changes I
make. Is this by design or a defect? I don't know how else to
selectively revert changes to a file through my diff viewer.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to