| commit | 30e8e6fdeadbd7c3f7dd8defed654e1e98290a45 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 28 Jun 2012 22:20:35 +0000 (28 15:20 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 28 Jun 2012 22:20:35 +0000 (28 15:20 -0700) | ||
| tree | 0cfc87e044491a1879cef0eb6258c4eb0562e13c | treesnapshot (tar.gz zip) |
| parent | fbc9724188fb4040e1f248de1e61752b385c1841 | commitdiff |
| parent | 2d1ccebae41541946ddd7e32f291f3c8983feea9 | commitdiff |
Merge branch 'lk/more-helpful-status-hints'
Give finer classification to various states of paths in conflicted
state and offer advice messages in the "git status" output.
Give finer classification to various states of paths in conflicted
state and offer advice messages in the "git status" output.