Resolve conflicts

Author: aviskarkc10

.editorconfig

@@ -0,0 +1,13 @@
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.ignore .smart-commit-ignore.ignore renamed to .smart-commit-ignore

@@ -1,3 +1,5 @@
+![smart commit logo](assets/logo.svg)
+
 # Smart Commit
 
 Create a commit prefixed with the current branch name.
@@ -14,23 +16,34 @@ curl https://raw.githubusercontent.com/sbimochan/smart-commit/master/commit -o /
 
 * If your current branch name is `EF-803`
 
-```shell
-$ commit "New feature"
+  ```shell
+  $ commit "New feature"
 
-# translates to
-git commit -m "EF-803: New feature"
-```
+  # translates to
+  git commit -m "EF-803: New feature"
+  ```
 
 * If your current branch is either of `dev`, `uat`, `qa`, `staging` or `master`
 
-```shell
-$ commit "New feature"
+  ```shell
+  $ commit "New feature"
 
-# translates to
-git commit -m "New feature"
-```
+  # translates to
+  git commit -m "New feature"
+  ```
+
+## Skip Branches
+
+To add a custom branch that you would like to skip, create a `.smart-commit-ignore` file in your top level directory. A `.smart-commit-ignore` file looks like [this](https://github.com/sbimochan/smart-commit/blob/master/.smart-commit-ignore).
+
+Additionally, you might want to add `.smart-commit-ignore` to your `.gitignore` file.
+
+## Contributors
 
-You can create a `.ignore` file in your directory to add custom branches you want to ignore. A `.ignore` file looks like [this](https://github.com/sbimochan/smart-commit/blob/master/.ignore).
+1. [Aviskar KC](https://github.com/aviskarkc10)
+2. [Robus Gauli](https://github.com/RobusGauli)
+3. [Saroj Shahi](http://sarojshahi.com.np/)
+4. [Saugat Acharya](https://github.com/mesaugat)
 
 ## License
 

README.md

@@ -1,39 +1,40 @@
 #!/usr/bin/env bash
+set -euo pipefail
 
-echo 'Running commit script'
-
-IGNORED_BRANCHES=("dev" "master" "qa" "uat" "staging")	
-IGNORED_PATH="./.ignore"
-
-if [ -f "$IGNORED_PATH" ]
-then
-    CUSTOM_BRANCHES=$(cat "$IGNORED_PATH")
-    BRANCHES=( $CUSTOM_BRANCHES )
-    IGNORED_BRANCHES=( ${IGNORED_BRANCHES[@]} ${BRANCHES[@]} )
-fi	
+if [ -z "${1:-}" ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
+    echo "Create a commit prefixed with the current branch name."
+    echo
+    echo "Usage:"
+    echo "  commit MESSAGE"
+    echo
+    echo "Example:"
+    echo "  commit \"Hello world!\""
+    exit 1
+fi
 
-CURRENT_BRANCH_CMD="git symbolic-ref --short HEAD"
-CURRENT_BRANCH=$(eval $CURRENT_BRANCH_CMD)
+CURRENT_BRANCH="$(git symbolic-ref --short HEAD)"
+GIT_ROOT_DIRECTORY=$(git rev-parse --show-toplevel)
+IGNORED_BRANCHES=("dev" "master" "qa" "uat" "staging")
+CUSTOM_IGNORED_PATH="$GIT_ROOT_DIRECTORY/.smart-commit-ignore"
 
-COMMIT_WITH_BRANCH="git commit -m \"$CURRENT_BRANCH: $1\""
-DEFAULT_COMMIT="git commit -m \"$1\""
+if [ -f "$CUSTOM_IGNORED_PATH" ]; then
+    CUSTOM_BRANCHES=$(cat "$CUSTOM_IGNORED_PATH")
+    BRANCHES=($CUSTOM_BRANCHES)
+    IGNORED_BRANCHES=(${IGNORED_BRANCHES[@]} ${BRANCHES[@]})
+fi
 
 IS_IGNORED=false
-	
-for branch in "${IGNORED_BRANCHES[@]}";
-    do
-        if [ "$CURRENT_BRANCH" == $branch ]
-        then
-            IS_IGNORED=true
-	    break
+
+for branch in "${IGNORED_BRANCHES[@]}"; do
+    if [ "$CURRENT_BRANCH" == $branch ]; then
+        IS_IGNORED=true
+        break
 	fi
 done
 
-if [ "$IS_IGNORED" == false ]
-then
-    echo "Commiting with branch name -> $CURRENT_BRANCH"
-    eval $COMMIT_WITH_BRANCH
+if [ "$IS_IGNORED" == false ]; then
+    # Edit your config here
+    git commit -m "$CURRENT_BRANCH: $1"
 else
-    echo "Commiting with default branch"
-    eval $DEFAULT_COMMIT
+    git commit -m "$1"
 fi