salhernandez

#!/bin/bash

function get_branch() {
    git branch --no-color | grep -E '^\*' | awk '{print $2}' \
        || echo “default_value”
}

branch_to_merge="master"
current_branch=$(get_branch)
timestamp=$(date +%m-%d-%Y_%H-%M-%S)

salhernandez

#!/bin/bash

# Invoke it by .... sh notifyMe generateJs
# This is meant for tasks that require more than a few seconds to execute. Upon completion the push notification via Pushover will be sent.
# Can be used for compiling an Android .apk from React-Native, etc...
listDirectory="listDirectory"
buildAndroid="buildAndroid"

if [ $1 = $command1 ]; then
    ls

salhernandez

Install Meld from their webpage http://meldmerge.org/

I had to tell git where it was:

git config --global merge.tool meld git config --global diff.tool meld

If using windows 8 and 10 use the following git config --global mergetool.meld.path "/c/Program Files (x86)/meld/meld.exe" git config --global difftool.meld.path "/c/Program Files (x86)/meld/meld.exe"

salhernandez

#!/bin/bash

# This way you can customize which branches should be skipped when
# prepending commit message. 
if [ -z "$BRANCHES_TO_SKIP" ]; then
  BRANCHES_TO_SKIP=(master develop test)
fi

BRANCH_NAME=$(git symbolic-ref --short HEAD)
#change what you want to grab from the branch