diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-05-19 13:17:49 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-05-19 13:17:49 -0700 |
commit | d0c692263f453f267ddd82b90b1a2fcff9d45f5f (patch) | |
tree | fbf5d1a1a60267b2e8904f180b97e65874fd506a /t/t6032-merge-large-rename.sh | |
parent | Sync with 2.4.1 (diff) | |
parent | diff-lib.c: adjust position of i-t-a entries in diff (diff) | |
download | tgif-d0c692263f453f267ddd82b90b1a2fcff9d45f5f.tar.xz |
Merge branch 'nd/diff-i-t-a'
After "git add -N", the path appeared in output of "git diff HEAD"
and "git diff --cached HEAD", leading "git status" to classify it
as "Changes to be committed". Such a path, however, is not yet to
be scheduled to be committed. "git diff" showed the change to the
path as modification, not as a "new file", in the header of its
output.
Treat such paths as "yet to be added to the index but Git already
know about them"; "git diff HEAD" and "git diff --cached HEAD"
should not talk about them, and "git diff" should show them as new
files yet to be added to the index.
* nd/diff-i-t-a:
diff-lib.c: adjust position of i-t-a entries in diff
Diffstat (limited to 't/t6032-merge-large-rename.sh')
0 files changed, 0 insertions, 0 deletions