Permalink
Commits on Apr 17, 2013
  1. Merge pull request #30 from lmars/add-upstream-state

    Add upstream state to PS1
    committed Apr 17, 2013
  2. Add upstream state to PS1

    Lewis Marshall committed Apr 17, 2013
Commits on Mar 7, 2013
  1. Merge pull request #27 from phatblat/pull/suppress-ps1-errors

    Suppress dirty marker and errors building PS1 when outside a repo
    committed Mar 7, 2013
  2. @phatblat
  3. @phatblat

    Suppress git errors when building PS1.

    Makes moving outside repos much less noisy.
    phatblat committed Mar 7, 2013
Commits on Mar 5, 2013
  1. Merge pull request #26 from phatblat/pull/rebase-marker-fix

    Fix detection for rebase in progress
    committed Mar 5, 2013
  2. @phatblat
  3. @richardkmichael
  4. Merge pull request #19 from slippyd/master

    Added Additional Git Config Color Options
    committed Mar 5, 2013
  5. Merge pull request #25 from phatblat/cherry-pick-inprogress

    Add state marker to prompt while cherry pick is in progress
    committed Mar 5, 2013
  6. @phatblat
Commits on Feb 10, 2013
  1. @capnslipp

    add color.sh.dirty-stash and color.sh.repo-state to docs

    Slipp Douglas committed with capnslipp Apr 22, 2012
Commits on Jan 24, 2013
  1. Merge pull request #24 from hhulkko/master

    Fix _git_dirty
    committed Jan 24, 2013
  2. @hhulkko

    Fix _git_dirty so that it works with git 1.8.1.1

    Since 1.8.1.1 [1] "git status" on a clean tree displays
    "nothing to commit, working directory clean" instead of
    "nothing to commit, (working directory clean)"
    
    [1] git/git@50bd8b7#L0R1050
    hhulkko committed Jan 24, 2013
Commits on Sep 18, 2011
  1. remove bundle top-level alias

    committed Sep 18, 2011
  2. remove ps alias

    committed Sep 18, 2011
Commits on Aug 28, 2011
  1. revert fenced code blocks in README

    Reverts some of b063d38
    
    The bash syntax highlighting isn't making these code blocks any more
    readable and makes the raw text file much uglier. The highlighting is
    more distracting than anything.
    committed Aug 28, 2011
  2. Merge remote-tracking branch 'alex-morega/dirty-stash'

    Conflicts:
    	git-sh.bash
    committed Aug 28, 2011
  3. Merge pull request #13 from alex-morega/repo-state

    show if repository is during a rebase or merge
    committed Aug 28, 2011
Commits on Aug 19, 2011
  1. @mgax
  2. @mgax
Commits on Jun 15, 2011
  1. Merge pull request #11 from Zearin/patch-1

    Added syntax highlighting for code blocks.  Few minor typographical tweak
    committed Jun 15, 2011
Commits on Jun 14, 2011
Commits on Feb 21, 2011
  1. git-completion.bash up to version shipped w/ git-1.7.2.1

    I really need to find a better way of managing this. Right now we
    have a bunch of source level hacks for dealing with commands aliased
    to top-level. It looks like git-completion.bash has abstracted
    detection of expansions behind a few functions. We could possibly
    overwrite those functions with custom versions that makes out
    gitalias commands available.
    committed Feb 21, 2011
  2. allow git alias commands with single quotes

    This works around alias commands like:
    
      lg = log --graph --all --pretty=format:'blah blah'
    
    It makes it impossible to use double-quotes however.
    
    Closes #7
    committed Feb 21, 2011
Commits on Apr 1, 2010
Commits on Mar 30, 2010
  1. CHANGES file

    committed Mar 30, 2010