mirrors/git-flight-rules
mirrors
/
git-flight-rules
mirror of https://github.com/k88hudson/git-flight-rules.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add Sublime Merge to list of GUI Clients

This commit is contained in:
gary 2018-10-19 08:46:55 -07:00
parent 83261c5b7a
commit d2fc3699bf
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -297,7 +297,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 <commit>
```
@ -1533,3 +1533,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.
* [Sublime Merge](https://www.sublimemerge.com/) - a beautiful Git client from the same team behind Sublime Text.