mirror of
https://github.com/mhagger/git-imerge.git
synced 2024-08-16 18:40:24 +03:00
README: update installation instructions
- Add link to PyPI, which was overlooked in 1c14b8a22f
- Add link to Homebrew and remove the assertion that it's only for macOS
This commit is contained in:
parent
55fa079e54
commit
f9834c4bc4
@ -36,7 +36,7 @@ Bash completion requires Git's completion being available.
|
|||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
`git-imerge` is available on PyPI_, so you can install it with `pip`:
|
`git-imerge` is available on [PyPI](https://pypi.org), so you can install it with `pip`:
|
||||||
|
|
||||||
$ pip install git-imerge
|
$ pip install git-imerge
|
||||||
|
|
||||||
@ -45,7 +45,7 @@ or using `setup.py` if you have downloaded the source package locally:
|
|||||||
|
|
||||||
$ python setup.py install
|
$ python setup.py install
|
||||||
|
|
||||||
If you are on macOS, you can use Homebrew to install `git-imerge`:
|
If you prefer, you can use [Homebrew](https://brew.sh) to install `git-imerge`:
|
||||||
|
|
||||||
$ brew install git-imerge
|
$ brew install git-imerge
|
||||||
|
|
||||||
@ -258,7 +258,7 @@ When `git imerge continue` or `git imerge record` finds a resolved merge in the
|
|||||||
|
|
||||||
## Testing
|
## Testing
|
||||||
|
|
||||||
`git-imerge` uses [`tox`](https://tox.readthedocs.io/) to run tests. To run the test suite with the system's default Python:
|
`git-imerge` uses [`tox`](https://tox.readthedocs.io) to run tests. To run the test suite with the system's default Python:
|
||||||
|
|
||||||
$ tox
|
$ tox
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user