nickautomatic · January 19, 2017 01:52 · Jan 19, 2017 · Oct 12, 2016 · Jul 12, 2016 · Feb 23, 2016
diff --git a/.bashrc b/.bashrc
@@ -2,6 +2,9 @@
 export PATH=/c/Program\ Files/cwRsync/:/c/Users/Nick/AppData/Roaming/npm/:$PATH
 export VAGRANT_HOME=/c/HashiCorp/Vagrant/.vagrant.d/
 
+## Custom Bash Prompt:
+export PS1='\[\033]0;$MSYSTEM:${PWD//[^[:ascii:]]/?}\007\]\n\[\033[32m\]\u@\h \[\033[33m\]\w\[\033[36m\]`__git_ps1`\[\033[0m\]\n$ '
+
 ## For nice diffs:
 # install diff-so-fancy (npm -g diff-so-fancy)
 # set pager to use it (git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX")

diff --git a/.bashrc b/.bashrc
@@ -2,13 +2,9 @@
 export PATH=/c/Program\ Files/cwRsync/:/c/Users/Nick/AppData/Roaming/npm/:$PATH
 export VAGRANT_HOME=/c/HashiCorp/Vagrant/.vagrant.d/
 
-## Functions:
-function strip_diff_leading_symbols(){
-	color_code_regex="(\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K])"
-
-	# actually strips the leading symbols
-	sed -r "s/^($color_code_regex)[\+\-]/\1 /g"
-}
+## For nice diffs:
+# install diff-so-fancy (npm -g diff-so-fancy)
+# set pager to use it (git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX")
 
 ## FuelPHP:
 alias oil='php oil'

diff --git a/.bashrc b/.bashrc
@@ -27,6 +27,7 @@ alias gr='git remote'
 alias grb='git rebase'
 alias grs='git reset'
 alias gs='git status'
+alias kraken='~/AppData/Local/gitkraken/Update.exe --processStart gitkraken.exe'
 
 ## Vagrant
 alias v='vagrant'

diff --git a/.bashrc b/.bashrc
@@ -2,6 +2,14 @@
 export PATH=/c/Program\ Files/cwRsync/:/c/Users/Nick/AppData/Roaming/npm/:$PATH
 export VAGRANT_HOME=/c/HashiCorp/Vagrant/.vagrant.d/
 
+## Functions:
+function strip_diff_leading_symbols(){
+	color_code_regex="(\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K])"
+
+	# actually strips the leading symbols
+	sed -r "s/^($color_code_regex)[\+\-]/\1 /g"
+}
+
 ## FuelPHP:
 alias oil='php oil'
 

diff --git a/.bashrc b/.bashrc
@@ -22,6 +22,7 @@ alias gs='git status'
 
 ## Vagrant
 alias v='vagrant'
+alias homestead='function __homestead() { (cd /c/www/homestead && vagrant $*); unset -f __homestead; }; __homestead'
 
 ## Other commands:
 alias explore='explorer'

diff --git a/.bashrc b/.bashrc
@@ -27,4 +27,7 @@ alias v='vagrant'
 alias explore='explorer'
 alias ll='ls -alFh --color'
 alias subl='subl -a' # adding -a flag to sublime prevents double window-opening
-alias x='exit'
+alias x='exit'
+
+echo
+echo 'Loaded custom .bashrc'
diff --git a/.bashrc b/.bashrc
@@ -1,10 +1,11 @@
-## General:
+## Global variables:
+export PATH=/c/Program\ Files/cwRsync/:/c/Users/Nick/AppData/Roaming/npm/:$PATH
+export VAGRANT_HOME=/c/HashiCorp/Vagrant/.vagrant.d/
 
-alias ll='ls -alFh --color'
-alias x='exit'
+## FuelPHP:
+alias oil='php oil'
 
 ## Git:
-
 alias ga='git add'
 alias gb='git branch'
 alias gco='git checkout'
@@ -19,6 +20,11 @@ alias grb='git rebase'
 alias grs='git reset'
 alias gs='git status'
 
-## FuelPHP:
+## Vagrant
+alias v='vagrant'
 
-alias oil='php oil'
+## Other commands:
+alias explore='explorer'
+alias ll='ls -alFh --color'
+alias subl='subl -a' # adding -a flag to sublime prevents double window-opening
+alias x='exit'
diff --git a/.bashrc b/.bashrc
@@ -1,6 +1,6 @@
 ## General:
 
-alias ll='ls -la --color'
+alias ll='ls -alFh --color'
 alias x='exit'
 
 ## Git:

diff --git a/.bashrc b/.bashrc
@@ -7,13 +7,16 @@ alias x='exit'
 
 alias ga='git add'
 alias gb='git branch'
-alias gch='git checkout'
+alias gco='git checkout'
 alias gcm='git commit -m'
 alias gd='git diff'
 alias gl="git log --graph --date-order --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(yellow) %an %Creset' --abbrev-commit --date=relative"
+alias gm='git merge'
 alias gpl='git pull'
 alias gps='git push'
 alias gr='git remote'
+alias grb='git rebase'
+alias grs='git reset'
 alias gs='git status'
 
 ## FuelPHP:

diff --git a/.bashrc b/.bashrc
@@ -0,0 +1,21 @@
+## General:
+
+alias ll='ls -la --color'
+alias x='exit'
+
+## Git:
+
+alias ga='git add'
+alias gb='git branch'
+alias gch='git checkout'
+alias gcm='git commit -m'
+alias gd='git diff'
+alias gl="git log --graph --date-order --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(yellow) %an %Creset' --abbrev-commit --date=relative"
+alias gpl='git pull'
+alias gps='git push'
+alias gr='git remote'
+alias gs='git status'
+
+## FuelPHP:
+
+alias oil='php oil'
No results found