THEME SUBLIME MERGE INSTALL
THEME SUBLIME MERGE FULL
THEME SUBLIME MERGE CODE

When writing a commit message, use Ctrl+Enter to commit. Use Tab to navigate through parts of the application, Space to toggle expansion, and Enter to stage/unstage hunks. This will also follow any file moves or renames throughout the repository.

THEME SUBLIME MERGE FULL

Select any two commits in Sublime Merge with Ctrl+Left Mouse to show the diff between them.įrom any file or hunk in the history use File History or the Hunk History button to view the full history of that source code. This includes when you rename or move a file, when you're resolving conflicts or just viewing commit history. Where it makes sense we will show you exactly which individual characters have been changed for a commit.

THEME SUBLIME MERGE CODE

The blame tool will also detect when a piece of code was moved from another place in your repository, so you can truly follow the history of your code. Click a line in the gutter to highlight all other lines from the same commit. Open the Blame of a file through the Command Palette or when viewing a commit to see exactly which lines of the file were added by which commits.Įasily view the age, author, and commit hash of every line of code and see which lines come from the same commit with our commit color coding. With a powerful, cross-platform UI toolkit, an unmatched syntax highlighting engine, and a custom high-performance Git reading library, Sublime Merge sets the bar for performance. Sublime Merge is built on the same custom platform as Sublime Text, providing unmatched responsiveness. You can open search with Ctrl+F or through the menu: Navigate Search. Complex search queries can be constructed using and, or and () symbols.įor example min-parents:2 author:jskinner path:tests/* (bug fix or test) will search for a merge commit from jskinner inside the tests directory that contain the words 'bug' and 'fix' or the word 'test'. Search for commit messages, commit authors, file names, and wildcard patterns. Use find-as-you-type search to dig up the exact commit you're looking for. Use Ctrl+S or the Save button to save your merged file. The same text editing functionality as Sublime Text is also available for more complicated merges.Ĭlicking on the header in the middle pane will switch between the editable merge results and the base file. In the center pane is the resolved text, with buttons to choose between your changes or theirs. On the left are your changes and on the right are theirs. The Integrated Merge Tool allows you to resolve any merge conflicts directly in Sublime Merge, rather than having to open up your editor of choice.Ĭonflicts are presented with a 3-pane view. Stage Files, Hunks and Lines with no waiting - Sublime Merge is really, really fast.

A snappy UI, three-way merge tool, side-by-side diffs, syntax highlighting, and more. Meet a new Git Client, from the makers of Sublime Text. Note: Don't forget to restart Sublime Text after activating the theme.Git Client, done Sublime. You can choose whichever flavor you like, but don't forget to change both color scheme and UI theme so they match. Copy the folder into Packages directory, which you can find using the menu item Sublime Text -> Preferences -> Browse Packages.Īctivate the UI theme and color scheme by modifying your user preferences file, which you can find using the menu item Sublime Text -> Preferences -> Settings - User ( ⌘, on Mac).Unzip and rename the folder to Theme - Spacegray.

THEME SUBLIME MERGE INSTALL

Choose Package Control: Install Package.Open Command Palette using menu item Tools -> Command Palette.The easiest way to install is using Sublime Package Control, where Spacegray is listed as Theme - Spacegray. The font used in the screenshots is Source Code Pro. Light variation based on Base16 Ocean Light color scheme.Ī variation based on Base16 Eighties Dark color scheme.

Comes in different flavors with accompanying Base16 color schemes.ĭefault flavor based on Base16 Ocean Dark color scheme.

A set of custom UI themes for Sublime Text 2/3.

Theme sublime merge