summaryrefslogtreecommitdiff
path: root/Documentation/technical
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-06-28 15:20:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-28 15:20:35 -0700
commit30e8e6fdeadbd7c3f7dd8defed654e1e98290a45 (patch)
tree0cfc87e044491a1879cef0eb6258c4eb0562e13c /Documentation/technical
parentMerge branch 'lk/rebase-i-x' (diff)
parentstatus: better advices when splitting a commit (during rebase -i) (diff)
downloadtgif-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 'Documentation/technical')
0 files changed, 0 insertions, 0 deletions