| commit | e64734b6a0ffabdbf027cfee865a6cae567e2199 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 7 Apr 2013 21:32:03 +0000 (7 14:32 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 7 Apr 2013 21:32:03 +0000 (7 14:32 -0700) | ||
| tree | b62fae295b689d82aaf46029328f7f649d193639 | treesnapshot (tar.gz zip) |
| parent | 88dccb6c989735e2faa24fa78d441a7a1c998b36 | commitdiff |
| parent | 87e139c0ad32b72ad989fe7d69381f1146250f7a | commitdiff |
Merge branch 'mm/status-during-revert'
"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
"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