Skip to content
  • Duy Nguyen's avatar
    diff: add --compact-summary · ddf88fa6
    Duy Nguyen authored and Junio C Hamano's avatar Junio C Hamano committed
    Certain information is currently shown with --summary, but when used
    in combination with --stat it's a bit hard to read since info of the
    same file is in two places (--stat and --summary).
    
    On top of that, commits that add or remove files double the number of
    display lines, which could be a lot if you add or remove a lot of
    files.
    
    --compact-summary embeds most of --summary back in --stat in the
    little space between the file name part and the graph line, e.g. with
    commit 0433d533
    
    :
    
       Documentation/merge-config.txt         |  4 +
       builtin/merge.c                        |  2 +
       ...-pull-verify-signatures.sh (new +x) | 81 ++++++++++++++
       t/t7612-merge-verify-signatures.sh     | 45 ++++++++
       4 files changed, 132 insertions(+)
    
    It helps both condensing information and saving some text
    space. What's new in diffstat is:
    
    - A new 0644 file is shown as (new)
    - A new 0755 file is shown as (new +x)
    - A new symlink is shown as (new +l)
    - A deleted file is shown as (gone)
    - A mode change adding executable bit is shown as (mode +x)
    - A mode change removing it is shown as (mode -x)
    
    Note that --compact-summary does not contain all the information
    --summary provides. Rewrite percentage is not shown but it could be
    added later, like R50% or C20%.
    
    Signed-off-by: default avatarNguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    ddf88fa6