diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-21 22:11:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-26 14:08:43 -0700 |
| commit | 06151739988601b0fe6179c6c67a0031b85b536f (patch) | |
| tree | d67e510b5ad547936014e1659445f50d7fe54785 /po/git.pot | |
| parent | diff-no-index: DWIM "diff D F" into "diff D/F F" (diff) | |
| download | tgif-06151739988601b0fe6179c6c67a0031b85b536f.tar.xz | |
diff-no-index: align D/F handling with that of normal Git
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: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'po/git.pot')
0 files changed, 0 insertions, 0 deletions