![]() This shows you the last change made to that file to bring it to the state you now see in your working tree. Difference between two previous revisions It will not show changes newer than your working tree. If you want to see the difference between two revisions which are already committed, use the Log dialog and select the two revisions you want to compare (using the usual Ctrl-modifier). Then select Compare revisions from the context menu (cf. Then the Compare Revisions dialog appears, showing a list of changed files (maybe with a folder filter pre-applied). Read more in the section called “Comparing Version”. If you want to see the changes made to all files in a particular revision in one view, you can use Unified-Diff output (GNU patch format). This shows only the differences with a few lines of context. It is harder to read than a visual file compare, but will show all the changes together. From the Revision Log dialog select the revision of interest, then select Show Differences as Unified-Diff from the context menu. If you want to see the differences between two different files, you can do that directly in explorer by selecting both files (using the usual Ctrl-modifier). Then from the explorer context menu select TortoiseGit → Diff. If you want to see the changes of different branches (maybe the current one to another branch or two branches) you can use the log dialog and select the two revisions as described above for "Difference between two previous revisions". An easier way is to open the reference browser (cf. ![]() There you can click on one branch and select Compare to working tree to see all changes between that branch and your current state of the working tree. You can also select two branches and compare those using the context menu as described in the section called “Browse All Refs”. The built-in tools supplied with TortoiseGit do not support viewing differences between directory hierarchies. If you have configured a third party diff tool, you can use Shift when selecting the Diff command to use the alternate tool resp. Read the section called “External Program Settings” to find out about configuring other diff tools. Sometimes in the life of a project you might change the line endings from CRLF to LF, or you may change the indentation of a section. Unfortunately this will mark a large number of lines as changed, even though there is no change to the meaning of the code. The options here will help to manage these changes when it comes to comparing and applying differences. You will see these settings in the Comparing Version dialog (cf. the section called “Comparing Version”), as well as in the settings for TortoiseGitMerge. Ignore line endings excludes changes which are due solely to difference in line-end style.Ĭompare whitespaces includes all changes in indentation and inline whitespace as added/removed lines. Ignore whitespace changes excludes changes which are due solely to a change in the amount or type of whitespace, e.g.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |