Skip to content

Instantly share code, notes, and snippets.

@parndt

parndt/gist:958385

Forked from mhaylock/gist:958381
Created May 6, 2011 03:19
Download ZIP

Revisions

  1. parndt revised this gist May 6, 2011. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion gistfile1.md
    View file
    Original file line number Diff line number Diff line change
    @@ -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
  2. parndt revised this gist May 6, 2011. 1 changed file with 3 additions and 3 deletions.
    6 changes: 3 additions & 3 deletions gistfile1.md
    View file
    Original file line number Diff line number Diff line change
    @@ -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
  3. @mhaylock mhaylock created this gist May 6, 2011.
    30 changes: 30 additions & 0 deletions gistfile1.md
    View file
    Original file line number Diff line number Diff line change
    @@ -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)