My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 88dccb6 87e139c)
Merge branch 'mm/status-during-revert'
authorJunio C Hamano <gitster@pobox.com>
Sun, 7 Apr 2013 21:32:03 +0000 (14:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Apr 2013 21:32:03 +0000 (14:32 -0700)
"git status" learned to report that you are in the middle of a
revert session, just like it does for a cherry-pick and a bisect
session.

* mm/status-during-revert:
  status: show commit sha1 in "You are currently reverting" message
  status: show 'revert' state and status hint


Trivial merge
The core git plumbing