Fix conflicts

Author: aviskarkc10

README.md

@@ -1,22 +1,34 @@
-## Smart commit
-Create commit with current branch name
+# Smart Commit
 
-For example:
-If your current branch name is ```EF-803```
+Create a commit prefixed with the current branch name.
 
-```commit "New feature"```
+## Installation
 
-will produce command
+Run this command on terminal.
 
- ```git commit -m "EF-803: New feature"``` and execute it
+```shell
+curl https://raw.githubusercontent.com/sbimochan/smart-commit/master/commit -o /usr/local/bin/commit && chmod +x /usr/local/bin/commit
+```
+
+## Usage
 
-If your current branch is ```dev or uat or qa or master```
+* If your current branch name is `EF-803`
 
-```commit "New feature"```
+```shell
+$ commit "New feature"
+
+# translates to
+git commit -m "EF-803: New feature"
+```
 
-will produce default command
+* If your current branch is either of `dev`, `uat`, `qa`, `staging` or `master`
 
- ```git commit -m "New feature"``` and execute it
+```shell
+$ commit "New feature"
+
+# translates to
+git commit -m "New feature"
+```
 
 You can create a file `.ignore` in your directory to add custom branches you want to ignore. Example `.ignore` file:
 
@@ -26,9 +38,6 @@ sprint-11
 new-feature
 ```
 
-### Installation
-Run this command on terminal
-
-```curl https://raw.githubusercontent.com/sbimochan/smart-commit/master/commit -o /usr/local/bin/commit && chmod +x /usr/local/bin/commit```
+## License
 
-And restart the terminal
+[MIT](LICENSE)

commit

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+
 echo 'Running commit script'
 
 IGNORED_BRANCHES=("dev" "master" "qa" "uat" "staging")
@@ -29,7 +30,7 @@ done
 
 if [ "$IS_IGNORED" == false ]
 then
-    echo "Commiting with branch name-> $CURRENT_BRANCH"
+    echo "Commiting with branch name -> $CURRENT_BRANCH"
     eval $COMMIT_WITH_BRANCH
 else
     echo "Commiting with default branch"