Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

UnchangedFile is under version control and neither modified in working tree nor in Index.
UnversionedFile is not under version control, but only exists in the working tree. Use Stage to add the file or Ignore to ignore the file.
IgnoredFile is not under version control (exists only in the working tree) and is marked to be ignored.
ModifiedFile is modified in the working tree. Use Stage to add the changes to the Index or Commit the changes immediately.
StagedFile is modified and the changes have been staged to the Index. Either Commit the changes or Unstage changes to the working tree.
Staged ModifiedFile is modified in the working tree and in the Index in different ways. You may Commit either Index changes or working tree changes.

 

Image Added
Staged, WT as HEADFile is modified in the working tree and in the Index in different ways, but the working tree state is identical to the HEAD state. Using Stage will turn the file back to unchanged again.

Image Modified

Modified (File Mode)The content of the file is not modified, but the executable bits are set different than in the repository. Refer to Fixing 'Modified (File Mode)' on Windows on how to fix that state on Windows.

Modified (EOLs only)The content of the file is modified, but only differs in line endings from the Index state. This state will only be determined/show up if smartgit.refresh.inspectEol system property is set.

Modified (EOLs only,
not stageable)
The content of the file is modified, but only differs in line endings from the Index state; but, due to the Git configuration (usually core.autocrlf) this modification can't be staged.
Usually, when trying to stage, Git will issue a warning warning: LF will be replaced by CRLF in ... here. This state will only be determined/show up if smartgit.refresh.inspectEol system property is set.
AddedFile has been added to Index. Use Unstage to remove from the Index.

RemovedFile has been removed from the Index. Use Unstage to un-schedule the removal from the Index.

RenamedFile is scheduled for addition and has been detected as renamed, see Preferences, section Refresh

Renamed (untracked)File is untracked and has been detected as renamed, see Preferences, section Refresh

Rename SourceFile is the added (or missing) source of a detected Renamed or Renamed (untracked) file

MissingFile is under version control, but does not exist in the working tree. Use Stage or Remove to remove from the Index or Discard to restore in the wirking tree.

Added ModifiedFile has been added to the Index and there is an additional change in the working tree. Use Commit to either commit just the addition or commit addition and change.

Added MissingFile has been added to the Index, but the file is missing in the working tree. Use Commit to either commit just the addition or Stage to undo the addition.
Intent-to-AddFile is planned to be added to the Index. Use Add or Stage to add actually or Discard to revert to unversioned.
ConflictedA merge-like command resulted in conflicting changes. Use the Conflict Solver to fix the conflicts.

...