hack0001 · January 23, 2019 23:59 · Mar 5, 2013 · Mar 5, 2013 · Mar 5, 2013 · Jan 30, 2013
diff --git a/gistfile1.md b/gistfile1.md
@@ -1,3 +1,10 @@
+To see what shell you are using, you can:
+
+```echo $SHELL```
+and it will tell you.
+
+Use the below only if you are using bash.
+
 Run the following to create `~/.git-completion.bash`:
 
     curl https://raw.github.com/git/git/master/contrib/completion/git-completion.bash > ~/.git-completion.bash

diff --git a/gistfile1.md b/gistfile1.md
@@ -15,7 +15,7 @@ Then add the following to your `~/.bashrc` or `~/.bash_profile` after `PATH`:
     # Source the git bash completion file
     if [ -f ~/.git-completion.bash ]; then
         source ~/.git-completion.bash
-        source ~/.git-prompt.sh
+        source ~/.git-prompt.bash
         PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
     fi
 

diff --git a/gistfile1.md b/gistfile1.md
@@ -4,7 +4,7 @@ Run the following to create `~/.git-completion.bash`:
 
 and `~/.git-prompt.sh`:
 
-    curl https://raw.github.com/git/git/master/contrib/completion/git-prompt.sh > ~/.git-completion.bash
+    curl https://raw.github.com/git/git/master/contrib/completion/git-prompt.sh > ~/.git-prompt.bash
 
 
 Then add the following to your `~/.bashrc` or `~/.bash_profile` after `PATH`:

diff --git a/gistfile1.md b/gistfile1.md
@@ -1,6 +1,11 @@
 Run the following to create `~/.git-completion.bash`:
 
     curl https://raw.github.com/git/git/master/contrib/completion/git-completion.bash > ~/.git-completion.bash
+
+and `~/.git-prompt.sh`:
+
+    curl https://raw.github.com/git/git/master/contrib/completion/git-prompt.sh > ~/.git-completion.bash
+
 
 Then add the following to your `~/.bashrc` or `~/.bash_profile` after `PATH`:
 
@@ -10,21 +15,10 @@ Then add the following to your `~/.bashrc` or `~/.bash_profile` after `PATH`:
     # Source the git bash completion file
     if [ -f ~/.git-completion.bash ]; then
         source ~/.git-completion.bash
-        GIT_PS1_SHOWDIRTYSTATE=true
-        GIT_PS1_SHOWSTASHSTATE=true
-        GIT_PS1_SHOWUPSTREAM="auto"
-        PS1='\t:\[\033[32m\]$(__git_ps1 " (%s)")\[\033[00m\] \W$ '
+        source ~/.git-prompt.sh
+        PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
     fi
 
     export PS1
 
-This will display the branch name next to the folder name in the bash prompt.
-
-Symbols after the branch name indicate additional information about the repo state:
-
-* `*`: The branch has modifications
-* `$`: There are stashed changes
-* `=`: The branch is equal with the remote branch
-* `<`: The branch is behind the remote branch (can be fast-forwarded)
-* `>`: The branch is ahead of the remote branch (remote branch can be fast-forwarded)
-* `<>`: The branch and remote branch have diverged (will need merge)
+This will display the branch name next to the folder name in the bash prompt.
diff --git a/gistfile1.md b/gistfile1.md
@@ -1,6 +1,6 @@
 Run the following to create `~/.git-completion.bash`:
 
-    curl https://github.com/git/git/raw/master/contrib/completion/git-completion.bash > ~/.git-completion.bash
+    curl https://raw.github.com/git/git/master/contrib/completion/git-completion.bash > ~/.git-completion.bash
 
 Then add the following to your `~/.bashrc` or `~/.bash_profile` after `PATH`:
 

diff --git a/gistfile1.md b/gistfile1.md
@@ -13,7 +13,7 @@ Then add the following to your `~/.bashrc` or `~/.bash_profile` after `PATH`:
         GIT_PS1_SHOWDIRTYSTATE=true
         GIT_PS1_SHOWSTASHSTATE=true
         GIT_PS1_SHOWUPSTREAM="auto"
-        PS1='\t:\[\033[32m\]$(__git_ps1 " (%s)")\[\033[00m\]\W$ '
+        PS1='\t:\[\033[32m\]$(__git_ps1 " (%s)")\[\033[00m\] \W$ '
     fi
 
     export PS1

diff --git a/gistfile1.md b/gistfile1.md
@@ -5,15 +5,15 @@ Run the following to create `~/.git-completion.bash`:
 Then add the following to your `~/.bashrc` or `~/.bash_profile` after `PATH`:
 
     # Set the base PS1
-    PS1="\h:\W \u\$ "
-    
+    export PS1="\t: \W$ "
+
     # Source the git bash completion file
     if [ -f ~/.git-completion.bash ]; then
         source ~/.git-completion.bash
         GIT_PS1_SHOWDIRTYSTATE=true
         GIT_PS1_SHOWSTASHSTATE=true
         GIT_PS1_SHOWUPSTREAM="auto"
-        PS1='\h:\[\033[32m\]$(__git_ps1 " (%s)")\[\033[00m\]\W \u\$ '
+        PS1='\t:\[\033[32m\]$(__git_ps1 " (%s)")\[\033[00m\]\W$ '
     fi
 
     export PS1

diff --git a/gistfile1.md b/gistfile1.md
@@ -0,0 +1,30 @@
+Run the following to create `~/.git-completion.bash`:
+
+    curl https://github.com/git/git/raw/master/contrib/completion/git-completion.bash > ~/.git-completion.bash
+
+Then add the following to your `~/.bashrc` or `~/.bash_profile` after `PATH`:
+
+    # Set the base PS1
+    PS1="\h:\W \u\$ "
+
+    # Source the git bash completion file
+    if [ -f ~/.git-completion.bash ]; then
+        source ~/.git-completion.bash
+        GIT_PS1_SHOWDIRTYSTATE=true
+        GIT_PS1_SHOWSTASHSTATE=true
+        GIT_PS1_SHOWUPSTREAM="auto"
+        PS1='\h:\[\033[32m\]$(__git_ps1 " (%s)")\[\033[00m\]\W \u\$ '
+    fi
+
+    export PS1
+
+This will display the branch name next to the folder name in the bash prompt.
+
+Symbols after the branch name indicate additional information about the repo state:
+
+* `*`: The branch has modifications
+* `$`: There are stashed changes
+* `=`: The branch is equal with the remote branch
+* `<`: The branch is behind the remote branch (can be fast-forwarded)
+* `>`: The branch is ahead of the remote branch (remote branch can be fast-forwarded)
+* `<>`: The branch and remote branch have diverged (will need merge)