git.99rst.org
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fbc9724
2d1cceb
)
Merge branch 'lk/more-helpful-status-hints'
author
Junio C Hamano
<redacted>
Thu, 28 Jun 2012 22:20:35 +0000
(15:20 -0700)
committer
Junio C Hamano
<redacted>
Thu, 28 Jun 2012 22:20:35 +0000
(15:20 -0700)
Give finer classification to various states of paths in conflicted
state and offer advice messages in the "git status" output.
Trivial merge
git clone https://git.99rst.org/PROJECT