My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8054b9a 3ee4452)
Merge branch 'rr/prompt-revert-head'
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 16:34:43 +0000 (09:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Apr 2013 16:34:43 +0000 (09:34 -0700)
The prompt string generator did not notice when we are in a middle
of a "git revert" session.

* rr/prompt-revert-head:
  bash: teach __git_ps1 about REVERT_HEAD


Trivial merge
The core git plumbing