diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-29 00:20:35 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-29 00:20:35 +0200 |
| commit | 30e8e6fdeadbd7c3f7dd8defed654e1e98290a45 (patch) | |
| tree | 0cfc87e044491a1879cef0eb6258c4eb0562e13c /read-cache.c | |
| parent | Merge branch 'lk/rebase-i-x' (diff) | |
| parent | status: better advices when splitting a commit (during rebase -i) (diff) | |
| download | git-30e8e6fdeadbd7c3f7dd8defed654e1e98290a45.tar.xz git-30e8e6fdeadbd7c3f7dd8defed654e1e98290a45.zip | |
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.
Diffstat (limited to 'read-cache.c')
0 files changed, 0 insertions, 0 deletions