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
Sorry I'm going to go ahead and answer my own question:
$ git difftool $(git merge-base topic1 master) -- Path/SourceFile.cpp
I removed 'HEAD' from the command and now it picks up my changes and
compares to my working copy version (which is actually what I wanted).
I thought HEAD would point to m
2 matches
Mail list logo
