Skip to content

Commit

Permalink
Add git conflicted alias note to README
Browse files Browse the repository at this point in the history
  • Loading branch information
christoomey committed Jul 19, 2018
1 parent 6585e5b commit 451347a
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,24 @@ conflicts much more straightforward.
Usage
-----

### From git

The easist way to use Conflicted from git is to add an alias for it that opens
vim with the conflicted plugin activated. You can add the alias with the
following shell command:

``` sh
git config --global alias.conflicted '!vim +Conflicted'
```

From there, you can run conflicted directly from git with:

``` sh
git conflicted
```

Which will open Vim and start up the plugin.

### Commands

Conflicted provides three primary commands for working with conflicts:
Expand Down

0 comments on commit 451347a

Please sign in to comment.