stonewareslord/sync
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed detached head bug!

Browse Source
This commit is contained in:
Austen Adler 2014-07-30 12:47:13 -04:00
parent b5066288d1
commit b98730f6f9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bashrc
View File

@ -77,7 +77,7 @@ alias mv="mv -v"
alias la='ls -lah $LS_COLOR' alias la='ls -lah $LS_COLOR'
alias dt='date "+%F %T"' alias dt='date "+%F %T"'
alias awake='disphost; while true; do xdotool mousemove 0 0; sleep 60; done' alias awake='disphost; while true; do xdotool mousemove 0 0; sleep 60; done'
alias adk='/home/stonewareslord/applications/adk/bin/studio.sh>/dev/null&' alias adk='/home/stonewareslord/applications/adk/bin/studio.sh&>/dev/null'
alias resource='. ~/.bashrc' alias resource='. ~/.bashrc'
alias install='sudo apt-get install' alias install='sudo apt-get install'
alias search='sudo apt-cache search' alias search='sudo apt-cache search'
@ -155,8 +155,8 @@ function cinitify(){
mkdir $2 mkdir $2
cd $2 cd $2
git init git init
git remote add origin git@98.26.78.121:$1/$2.git git remote add origin git@austenwares.com:$1/$2.git
git remote add https https://98.26.78.121/gitlab/$1/$2.git git remote add https https://austenwares.com/gitlab/$1/$2.git
#Offline mode #Offline mode
git remote add oOrigin git@10.0.1.200:$1/$2.git git remote add oOrigin git@10.0.1.200:$1/$2.git
git remote add oHttps https://10.0.1.200/gitlab/$1/$2.git git remote add oHttps https://10.0.1.200/gitlab/$1/$2.git
@ -169,8 +169,8 @@ function cinitify(){
export -f cinitify export -f cinitify
function initify(){ function initify(){
git init git init
git remote add origin git@98.26.78.121:$1/$2.git git remote add origin git@austenwares.com:$1/$2.git
git remote add https https://98.26.78.121/gitlab/$1/$2.git git remote add https https://austenwares.com/gitlab/$1/$2.git
#Offline mode #Offline mode
git remote add oOrigin git@10.0.1.200:$1/$2.git git remote add oOrigin git@10.0.1.200:$1/$2.git
git remote add oHttps https://10.0.1.200/gitlab/$1/$2.git git remote add oHttps https://10.0.1.200/gitlab/$1/$2.git
@ -231,7 +231,7 @@ txtrst='\[\e[0m\]' # Text Reset
#History control #History control
if [ "$BASH" ]; then if [ "$BASH" ]; then
parse_git_branch() { parse_git_branch() {
git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ \1/' git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ \1/' | grep -oE '[^ ]+$'
} }
prompt(){ prompt(){
a=`parse_git_branch` a=`parse_git_branch`