summaryrefslogtreecommitdiff
path: root/Documentation/.gitattributes
diff options
context:
space:
mode:
authorLibravatar Matthieu Moy <Matthieu.Moy@imag.fr>2010-08-11 10:38:07 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-11 10:36:06 -0700
commite6c111b4c092c0dd24c541b9721f5bc04641dcb0 (patch)
tree55fd6f65b2479bba7d15dece5fad53a451b6369d /Documentation/.gitattributes
parentmerge-recursive: distinguish "removed" and "overwritten" messages (diff)
downloadtgif-e6c111b4c092c0dd24c541b9721f5bc04641dcb0.tar.xz
unpack_trees: group error messages by type
When an error is encountered, it calls add_rejected_file() which either - directly displays the error message and stops if in plumbing mode (i.e. if show_all_errors is not initialized at 1) - or stores it so that it will be displayed at the end with display_error_msgs(), Storing the files by error type permits to have a list of files for which there is the same error instead of having a serie of almost identical errors. As each bind_overlap error combines a file and an old file, a list cannot be done, therefore, theses errors are not stored but directly displayed. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/.gitattributes')
0 files changed, 0 insertions, 0 deletions