Merge remote branch 'upstream/master'
diff --git a/aliases/git.aliases.bash b/aliases/git.aliases.bash
index 40d8780..0ac2548 100644
--- a/aliases/git.aliases.bash
+++ b/aliases/git.aliases.bash
@@ -23,6 +23,7 @@
alias gco='git checkout'
alias gexport='git archive --format zip --output'
alias gdel='git branch -D'
+alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/master'
case $OSTYPE in
linux*)
@@ -61,7 +62,8 @@
echo " gcp = git cherry-pick"
echo " gco = git checkout"
echo " gexport = git git archive --format zip --output"
- echo " gdel = git branch -D"
- echo " gpo = git push origin"
+ echo " gdel = git branch -D"
+ echo " gpo = git push origin"
+ echo " gmu = git fetch origin -v; git fetch upstream -v; git merge upstream/master"
echo
}
diff --git a/bash_it.sh b/bash_it.sh
index f0c850c..60bef80 100644
--- a/bash_it.sh
+++ b/bash_it.sh
@@ -47,8 +47,9 @@
unset config_file
-export PS1=$PROMPT
-
+if [[ $PROMPT ]]; then
+ export PS1=$PROMPT
+fi
# Adding Support for other OSes
PREVIEW="less"
diff --git a/lib/appearance.bash b/lib/appearance.bash
index 4b1f568..f723511 100644
--- a/lib/appearance.bash
+++ b/lib/appearance.bash
@@ -8,4 +8,6 @@
export LSCOLORS='Gxfxcxdxdxegedabagacad'
# Load the theme
-source "$BASH/themes/$BASH_THEME/$BASH_THEME.theme.bash"
\ No newline at end of file
+if [[ $BASH_THEME ]]; then
+ source "$BASH/themes/$BASH_THEME/$BASH_THEME.theme.bash"
+fi
\ No newline at end of file