Repositories, Directories and Files
The Repositories view shows all local repositories known to SmartGit in a tree structure. Repositories which are opened by SmartGit will appear in Bold in this window, and the directory structure, and states of folders in the repository Working Tree will appear nested underneath each opened repository.
Similarly, the Files view displays the status of your working tree (and Index).
Double clicking a repository in the Repositories view will open the repository - this is usually quick, although SmartGit may take a while to open a large repository.
For a reference on what the various state colours and and icons mean, please consult:
- Primary Directory States for the primary directory states in the Repositories view.
- File States for the possible file states.
- Submodule States for a list of possible states of submodules.
Repository Management
To add existing or new local repositories to SmartGit, please take a look at Working with Repositories.
File Filtering in the Files view
File Filter
Files listed in the Files view can be filtered by file state and name by using the File Filter search input above the Files view.
- To filter by name, use the input field (or shortcut <Ctrl/Cmd>+<F>-keystroke) to enter a filename search pattern - files will be filtered automatically as you type.
- The search pattern supports regular expressions (RegEx)
- The
.*button can be toggled to find files with any file extension. - You can save common search patterns for later usage by clicking on the search icon in the File Filter and selecting Remember Pattern (similarly, Forget Pattern will remove the current pattern if it has been saved previously.
State Filter
The state filters can be set using the small toolbar buttons above the table as well as the menu items in the View menu. Please refer to File States for the meaning of each filter icon, or alternately hover the mouse over an icon to see its purpose.
Background Color highlighting
SmartGit will change the background color of the File view when files are hidden, as a reminder that files it considers important are being filtered from view:
- Light red - This means commitable files (e.g. index-only changed or untracked) are being hidden by one of the Files State filters.
- Light yellow - This means that files are being name-filtered by the File Filter search pattern.
- Gray - Even if unchanged files are hidden, they can be found by filtering by name - files matching by name but not by state are shown in gray.
Note
- If files that are not intended for staging the next commit are highlighted by the State filter, consider adding them to
.gitignore. - You can elect to turn off the background colour in the Low-level Properties advanced configuration, using option filteredTable.useBackgroundColor.
Directory States
| Icon | State | Description |
|---|---|---|
 |
Default | Directory is present in the repository (more precisely: there is at least one versioned file below this directory stored in the repository). |
 |
Modified | Directory is present in the repository and there are local changes within this directory in the working tree. |
 |
Unversioned | Directory (and contained files) are present in the working tree, but have not been added to the repository yet. Use Stage to add the files to the repository. |
 |
Ignored | Directory is not present in the repository (exists only in the working tree) and is marked as to be ignored. |
 |
Missing | Directory is present in the repository, but does not exist in the working tree. Use Stage to remove the files from the repository or Discard to restore them in the working tree. |
 |
Conflict | Repository contains conflicting files (only displayed on the root directory). Use Resolve to resolve the conflict. |
 |
Merge | Repository is in ‘merging’ or ‘rebasing’ state (only displayed on the root directory). Either Commit the merge/rebase or use Discard to cancel the merge/rebase. |
 |
Root/Submodule | Directory is either the repository root or a submodule root, see Submodule States |
File States
| Icon | State | Description |
|---|---|---|
 |
Unchanged | File is under version control and neither modified in working tree nor in Index. |
|
Unversioned | File is not under version control, but only exists in the working tree. Use Stage to add the file or Ignore to ignore the file, or Commit to commit it right away. |
 |
Ignored | File is not under version control (exists only in the working tree) and is marked to be ignored. |
 |
Modified | File is modified in the working tree. Use Stage to add the changes to the Index or Commit the changes immediately. |
 |
Staged | File is modified and the changes have been staged to the Index. Either Commit the changes or Unstage changes to the working tree. |
 |
Staged Modified | File is modified in the working tree and in the Index in different ways. You may Commit either Index changes only or working tree changes plus Index changes. |
|
Staged, WT as HEAD | File 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. |
|
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. |
 |
Added | File has been added to Index. Use Unstage to remove from the Index. |
 |
Removed | File has been removed from the Index. Use Unstage to un-schedule the removal from the Index. |
 |
Renamed | File 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 |
 |
Renamed (modified) | File is scheduled for addition, has been detected as renamed (in the Index) and – on top of that – is modified in the working tree. Use will probably want to use Stage to add the working tree changes to the Index. |
 |
Rename Source | File is the added (or missing) source of a detected Renamed file. |
 |
Rename Source (untracked) | File is the added (or missing) source of a detected Renamed (untracked) file. |
|
Missing | File 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 Modified | File 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. |
 |
Intent-to-Add | File is planned to be added to the Index. Use Add or Stage to add actually or Discard to revert to untracked. |
|
Conflicted | A merge-like command resulted in conflicting changes. Use the Conflict Solver to fix the conflicts. |
 |
Assume-Unchanged | File has the Assume Unchanged flag set. Use Toggle ‘Assume Unchanged’ to clear this flag. |
|
Skipped | File has the Skip Worktree flag set. Use Toggle ‘Skip Worktree’ to clear this flag. |
 |
Inaccessible | File’s working tree content is not accessible and hence its state can’t be evaluated. This usually happens if another application has an exclusive file system lock on this file. To resolve, shutdown all applications which might possibly lock this file. |
Submodule States
Many of the file states also apply to submodules. In addition, there are following notable submodule states which may either refer to the state of the submodule point relative to the parent repository, or to the contents of the submodule working tree, or to a combination of both of them.
| Icon | State | Description |
|---|---|---|
|
Submodule | Unchanged submodule. |
|
Modified pointer | Submodule in working tree points to a different commit than the one registered in the repository. Use Stage to register the new commit in the Index, or Reset to reset the submodule to the commit registered in the repository. |
|
Modified contents | The working tree (or Index) of the submodule contains modifications. Select/open the submodule repository and inspect changes. |
 |
Uninitialized submodule | Use Submodule|Initialize to initialize. |
 |
Foreign repository | Nested repository is not registered in the parent repository as submodule. Use Stage to register (and add) the submodule to the parent repository. |
|
Missing submodule | Submodule is registered in the parent repository and initialized, but it’s not locally present. Use Submodule|Initialize to fix. |
File table “duplicate(!)” marker
If the file table shows a duplicate(!) marker after a file name, this means that you are on a case insensitive file system such as Windows or on MacOS and your repository contains the same file in the same directory, but with different casing. Using filenames with the same names, but differing only in case is not advised in SmartGit, when the repository will be worked on by users with case insensitive file systems. If you encounter duplicate(!) the duplicate marker, it is recommended that you rename one or both files on a case-sensitive file system such as Linux (or WSL on Windows) and then push a new commit to the remote, where developers working on case-sensitive file systems can pull to resolve the issue.
Fixing ‘Modified (File Mode)’ on Windows
On Windows, the Modified (File Mode) state is usually caused due to a misconfiguration of your local repository, when not having core.filemode configuration option explicitly set to false (the default value is true).
You can add address the issue by invoking git config core.filemode false in the root directory of your repository to fix this problem - this adds the setting to the .git/config of your repository.