From 7c2ff642f07da0863d593b25b44caab43f2976f8 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Tue, 13 Jun 2017 16:37:32 +0300
Subject: [PATCH] - Now that's a README.

---
 README.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/README.md b/README.md
index 2c4e0c4..d736671 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,30 @@
 # Git pre-commit hooks
 
+[![Build
+Status](https://travis-ci.org/adarnimrod/git-pre-commit.svg?branch=master)](https://travis-ci.org/adarnimrod/git-pre-commit)
+
 [Pre-commit](http://pre-commit.com/) Git related hooks.
+
+- `merge-conflict`: Checks if your branch has merge conflicts with the master
+  branch.
+
+## Installation
+
+Add the following to your project's `.pre-commit-config.yaml`:
+
+    -    repo: https://www.shore.co.il/git/git-pre-commit
+         sha: v0.1.0
+         hooks:
+         - id: merge-conflict
+           always_run: True
+
+## License
+
+This software is licensed under the MIT license (see the `LICENSE.txt` file).
+
+## Author information
+
+Nimrod Adar, [contact me](mailto:nimrod@shore.co.il) or visit my
+[website](https://www.shore.co.il/). Patches are welcome via [git
+send-email](http://git-scm.com/book/en/v2/Git-Commands-Email). The repository is
+located at <https://www.shore.co.il/git/>.
-- 
GitLab