Side Bar🔗

Files and folders displayed in the side bar will include a status badge alongthe right-hand edge, when modified. This includes files and folder intheFolders section of the side bar, along with files in theOpen Filessection. Ignored files and folders are de-emphasized in the side bar byreducing the opacity of the name.

When the mouse pauses over a status badge, a tool tip will be displayedindicating the status of the file, or in the case of a folder, the status ofthe contained files and folders.

Status Bar🔗

When the focussed file us containing within the working directory of a Gitrepository, the status bar will contain the name of the current branch, alongwith the number of files that are untracked, modified, staged or unmerged. Thestatus bar element will look like:

Diff Markers🔗

Sublime Text’sincremental_diff functionality ties in withthe Git integration. By default, the incremental diff functionality trackschanges to the file since it was last saved, but it is also possible to diffagainst HEAD.

Here is an example of what the diff markers look like in action, using theMariana color scheme:

Changing the settinggit_diff_target to"head" will modify the diffmarkers to display a diff versus the version of the file at the Git repositoryHEAD, as opposed to the version of the file in the working directory.

See theincremental_diff documentation for more informationand examples, including instructions for viewing inline diffs, navigatingbetween hunks and reverting changes.

Sublime Merge Integration🔗

The Git features available in Sublime Text were derived from work that went intoour other product,Sublime Merge. SublimeMerge is a full-featured, blazing-fast Git client built upon the technologiesfrom Sublime Text.

Since editing source code and prose requires different tools and workflows thanmanaging a Git repository, we opted to integrate the most appropriate Gitfunctionality into Sublime Text, but leave more advanced features in SublimeMerge. The following integration points make it easy to jump into theappropriate Git context:

Settings🔗

"show_git_status"boolean🔗

Enables Git integration.

Default:true

"git_diff_target"string🔗

Controls the behavior of incremental diff for files in a Git repository. Valid values include:

• "index" – diff against the Git index

• "head" – diff against the file at HEAD

Default:"index"