Source Control Staging Categories and Statuses

The file change categories that can be displayed in the Changes table and the status that can be displayed are as follows.

• Staged Changes

  A staged file has been modified since the last commit and this change has been recorded in the repository index (that is, it has been staged). All staged changes become part of the Git history after the next commit and they are no longer displayed in the Git Commit dialog. Staged files have one of the following statuses, depending on the change that has taken place.

  • Added - a new file has been added to the repository index. It is unknown to the local repository HEAD; that is, it has not previously been committed.

  • Modified - a new version of a file has been added to the repository index. A previous version of the file exists in the local repository HEAD.

  • Deleted - the deletion of a file has been promoted from the working directory to the local repository index. A previous version of the file exists in the repository HEAD.

  • Renamed - the renaming of a file has been promoted from the working directory to the local repository index. A previous version of the file exists in the repository HEAD.

  • Type changed - a change in type for a file has been promoted from the working directory to the local repository index. A previous version of the file exists in the repository HEAD.

• Unstaged Changes

  An unstaged file has previously been recorded in the Git repository but has changes that have not yet been staged to the local repository index. Staging an unstaged file records the change into the local repository index and promotes the file to the Staged Changes type. Unstaged files have one of the following statuses, depending on the change that has taken place.

  • Modified - the file has been modified in the working directory. A previous version of the file exists in the repository index.

  • Missing - the file is missing from the working directory. It could have been moved or deleted. A previous version of the file exists in the index.

  • Renamed - the file has been renamed in the working directory. A previous version of the file exists in the repository index.

  • Type changed - the file type has been changed in the working directory. A previous version of the file exists in the repository index.

• Untracked Files

  An untracked file exists locally but is not a part of the Git local repository, as it has never been staged. Unless an untracked file has been added to a Git ignore list, it is displayed in the Untracked Files type in the table in the Git Commit dialog. Staging an untracked change records the change in the local repository index and promotes the file to the Staged Changes type. Untracked files have the following status.

  • Untracked - a new file in the working directory that is unknown to the local repository index or HEAD.

The following files are not displayed in the Git Commit dialog.

• Unaltered - the file has not been modified.

• Ignored - the file is untracked but its name or path matches an exclude pattern in the repository .gitignore file.

• Conflicted - the file has a conflict resulting from a merge action. These cannot be committed while conflicts exist.

2018.0.01 and higher