Skip to content

File Difference

Simeon Radivoev edited this page Sep 15, 2019 · 10 revisions

File Difference and Committing

All changes to files can be seen in detail in the Git Diff window. The Diff window separates files into change type categories like added, modified, staged, removed and so on.
Each category can be expanded by clicking on it. They can also be hidden entirely by adjusting the filter option in the toolbar.

See more info about committing.

Meta Changes

Each change can affect a file or it's metafile. UniGit unifies changes to the file meta and shows the change on the file with an icon this indicates that the metafile has changed. If an asset and it's meta were both changed, then the asset icon will appear alongside the meta icon.

Stage/Unstage

Each change has 2 distinct types of change. Changes made that are either staged or unstaged. This means that when you commit changes, only files that are "staged" will be committed. UniGit indicates such files with the tick as shown above.

To "stage" or "unstage" files you can right-click on a file and do so. This menu is also available in the Project View window.

Unstaged Changes

If don't use Auto Stage, when a file has been staged to index and changes have been made after, these changes must be staged again. UniGit can handle that automatically using Unity's Asset Database and its callbacks when Auto Stage is turned on. Sometimes even UniGit can miss a change even if Auto Stage is turned on.

When a file has changes made after it has been staged, a warning indicator will appear next to the file, as seen below. Clicking the icon will stage any unstaged changes.

Unstaged changes are also prioritized when sorting by default. This can be changed in the Sort options using Prioritize Unstaged Changes in the Git Diff Window

Unstaged Changes warning indicator

Differences/Changes

Differences between changed files and the previous version can be shown by clicking the Difference and Difference with previous version button in the context menu of each file. These options are also available in the Project View window.

Reverting

Files can also be reverted to before they were changed. To do so just click the Revert button in the context menu for each file. This option is also available in the Project View window.

Custom Context Menu

UniGit provides a user-friendly custom context menu with icons.

Custom Context Menu

That menu can be toggled by the Use Simple Context Menu option in the settings window.

In-Editor Diff Inspector

UniGit provides an In-Editor Diff Inspector for viewing differences between files.

Diff Inspector

You can open a line in an Editor by right-clicking on in and selecting Open Line In Editor