aboutsummaryrefslogtreecommitdiff
path: root/git-submodule.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-28 15:20:35 -0700
committerJunio C Hamano <gitster@pobox.com>2012-06-28 15:20:35 -0700
commit30e8e6fdeadbd7c3f7dd8defed654e1e98290a45 (patch)
tree0cfc87e044491a1879cef0eb6258c4eb0562e13c /git-submodule.sh
parentfbc9724188fb4040e1f248de1e61752b385c1841 (diff)
parent2d1ccebae41541946ddd7e32f291f3c8983feea9 (diff)
downloadgit-30e8e6fdeadbd7c3f7dd8defed654e1e98290a45.tar.gz
git-30e8e6fdeadbd7c3f7dd8defed654e1e98290a45.tar.xz
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 'git-submodule.sh')
0 files changed, 0 insertions, 0 deletions