git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Can't use difftool to selectively revert changes

From
RDRobert Dailey <rcdailey.lists@gmail.com>
Date
Feb 25, 2014, 15:22 UTC
Message-ID
<CAHd499BGt8KhU=QU7dZ+-AR67=3Rf7VhBXfiHg7Ks=vSg6YOQQ@mail.gmail.com>

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.

Next: Robert Dailey
Message 1 of 2 in “Can't use difftool to selectively revert changes”
  1. Robert DaileyFeb 25, 2014
  2. Robert DaileyFeb 25, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.