From 8f4ec811b33c94dc76b40d6ac37cf74c509cb770 Mon Sep 17 00:00:00 2001 From: Matthieu V Date: Tue, 23 Oct 2018 17:02:23 +0200 Subject: [PATCH] Added SublimeMerge client (#221) Creators of Sublime Text recently launched a Git client, it has a lot of potential ! I think it has its place in this list :smiley: Please tell me if my phrasing is wrong --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9cdc9b1..5002e2c 100644 --- a/README.md +++ b/README.md @@ -299,7 +299,7 @@ And you should be good to go. If you accidentally merged a feature branch to the main development branch before it was ready to be merged, you can still undo the merge. But there's a catch: A merge commit has more than one parent (usually two). -The command to use +The command to use ```sh (feature-branch)$ git revert -m 1 ``` @@ -1547,3 +1547,4 @@ Using `git reset` it is then possible to change master back to the commit it was * [Fork](https://git-fork.com/) - a fast and friendly Git client for Mac (beta) * [gmaster](https://gmaster.io/) - a Git client for Windows that has 3-way merge, analyze refactors, semantic diff and merge (beta) * [gitk](https://git-scm.com/docs/gitk) - a Git client for linux to allow simple view of repo state. +* [SublimeMerge](https://www.sublimemerge.com/) - Blazing fast, extensible client that provides 3-way merges, powerful search and syntax highlighting, in active development.