Nova^™

This extension provides integration with the Sublime Merge Git client.

Requirements

This extension requires some additional tools to be installed on your Mac:

• Sublime Merge
• The smerge command-line utility, if you want to use the “blame” and file history features.

Usage

To access the commands:

• Open the command palette and type Sublime Merge

The available workspace commands are:

• Open Workspace in Sublime Merge
• The default keyboard shortcut is Shift-Cmd-M

The following commands are available when editing a file that has previously been saved:

• Blame in Sublime Merge—show the Git blame view in Sublime Merge
• View file history in Sublime Merge—show the file’s history in Sublime Merge

Keyboard shortcuts

To set keyboard shortcuts for any of the above commands, use Nova’s key bindings feature.

Attribution

Icon: Merge by Stephen Plaster from the Noun Project CCBY

Version 1.0

Initial release

MIT License

Copyright (c) 2020 Nate Silva

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.