Skip to content
Snippets Groups Projects
Select Git revision
  • 833e48259e23aea76f3765d28d1b2200332301f7
  • passt default
  • master
  • pu
  • todo
  • next
  • maint
  • v2.8.0-rc1
  • v2.8.0-rc0
  • v2.7.2
  • v2.7.1
  • v2.7.0
  • v2.6.5
  • v2.7.0-rc3
  • v2.7.0-rc2
  • v2.7.0-rc1
  • v2.7.0-rc0
  • v2.6.4
  • v2.6.3
  • v2.6.2
  • v2.6.1
  • v2.3.10
  • v2.5.4
  • v2.4.10
  • v2.6.0
  • v2.6.0-rc3
  • v2.5.3
27 results

diff-no-index.c

Blame
  • user avatar
    Junio C Hamano authored
    When a commit changes a path P that used to be a file to a directory
    and creates a new path P/X in it, "git show" would say that file P
    was removed and file P/X was created for such a commit.
    
    However, if we compare two directories, D1 and D2, where D1 has a
    file D1/P in it and D2 has a directory D2/P under which there is a
    file D2/P/X, and ask "git diff --no-index D1 D2" to show their
    differences, we simply get a refusal "file/directory conflict".
    
    Surely, that may be what GNU diff does, but we can do better and it
    is easy to do so.
    
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    06151739
    History
    diff-no-index.c 6.99 KiB