I've moved a function from one file to another, and I'd like to compare the moved version to the original, so I'd like a diff with the source file on the left and the destination file on the right. Using TortoiseGit I can figure out how to diff two files in the working tree, or diff one file across multiple commits, but not both at once. Is it possible without checking out the two files?
How to compare two files in two revisions with TortoiseGit?
2.5k Views Asked by Max At
1
There are 1 best solutions below
Related Questions in TORTOISEGIT
- Stuck in confusion over Master / Origin / Branch when cloning
- Correct git.exe path for TortoiseGit under Git for windows 2.4
- GIT HOOK to check keyword "PROMOTE" in message when GIT MERGE is executed
- Cant do pull or push in Git
- Is it possible to mix TFS and GIT Extensions/TortoiseGit in the same solution?
- Git Folder Path spelling Capitalization mismatch
- Pull does nothing from Tortoise GUI, command line git works
- TortoiseGit - Multiple GitHub repositories with different key pairs each
- Why does TortoiseGit run prepare-commit-msg after commit message edit?
- What are these TLOG files? Should these be part of my source control?
- Adding sibling solutions into repository
- Why do I see an exclamation mark still?
- How to resolve Deleted merge conflict in TortoiseGit?
- How can I make a Pull request using TortoiseGit
- Merge branch xyz to master, and also update xyz with merge result
Related Questions in TORTOISEMERGE
- Ignore the files from merging
- Doesn't reintegrating a branch with TortoiseSVN require synchronising branch and trunk first?
- tortoisemerge with Hg reports all lines as changed
- Why can't I use TortoiseMerge as my git merge tool on Windows?
- Merge tool capable of merging conflicting changes
- Mysterious non-change showing up in TortoiseSVN / TortoiseMerge
- How to invoke tortoisemerge through a batch script?
- TortoiseSVN Commit failed: MERGE failed
- What does “Enable Editor Config” in the TortoiseMerge settings mean?
- tortoise svn folder icons not coming
- Install just TortoiseMerge software and context menu items
- TortoiseMerge indicates entire file as conflicted, then attempts to delete file
- Set up TortoiseMerge as external merge tool for SVN?
- Git gui mergetool TortoiseMerge wrong file path
- What is the base file in tortoise svn?
Trending Questions
- UIImageView Frame Doesn't Reflect Constraints
- Is it possible to use adb commands to click on a view by finding its ID?
- How to create a new web character symbol recognizable by html/javascript?
- Why isn't my CSS3 animation smooth in Google Chrome (but very smooth on other browsers)?
- Heap Gives Page Fault
- Connect ffmpeg to Visual Studio 2008
- Both Object- and ValueAnimator jumps when Duration is set above API LvL 24
- How to avoid default initialization of objects in std::vector?
- second argument of the command line arguments in a format other than char** argv or char* argv[]
- How to improve efficiency of algorithm which generates next lexicographic permutation?
- Navigating to the another actvity app getting crash in android
- How to read the particular message format in android and store in sqlite database?
- Resetting inventory status after order is cancelled
- Efficiently compute powers of X in SSE/AVX
- Insert into an external database using ajax and php : POST 500 (Internal Server Error)
Popular Questions
- How do I undo the most recent local commits in Git?
- How can I remove a specific item from an array in JavaScript?
- How do I delete a Git branch locally and remotely?
- Find all files containing a specific text (string) on Linux?
- How do I revert a Git repository to a previous commit?
- How do I create an HTML button that acts like a link?
- How do I check out a remote Git branch?
- How do I force "git pull" to overwrite local files?
- How do I list all files of a directory?
- How to check whether a string contains a substring in JavaScript?
- How do I redirect to another webpage?
- How can I iterate over rows in a Pandas DataFrame?
- How do I convert a String to an int in Java?
- Does Python have a string 'contains' substring method?
- How do I check if a string contains a specific word?
There is a way to do this (but not an obvious direct one):
Open the log dialog and navigate to the commit/file you want to diff. Drop it into Explorer or select "Save revision to..." and then select the two files you want to compare and select TortoiseGit -> Diff.
If the file is modified or was already committed in the meantime then you can also open the log dialog (make sure so that both files are in the history, e.g., by opening the log on a common directory). Select the commit of the first file and click on "Mark for comparison" in the context menu of the file, then navigate to the commit of the second file and select "Diff with ...".
UPDATE:
Starting with TortoiseGit 2.10.1.0 (preview release) you can select a file in Explorer and mark it using TortoiseGit -> "Diff later" and compare a file to this file from Log Dialog or Repository Browser using "Diff with ..." as described above.