Junio C Hamano d0c692263f 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

2015-05-19 13:17:49 -07:00

..

add.c

diff-lib.c: adjust position of i-t-a entries in diff

2015-03-23 13:42:33 -07:00

annotate.c

…

apply.c

Merge branch 'bc/object-id'

2015-05-05 21:00:23 -07:00

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'tb/blame-resurrect-convert-to-git'

2015-05-11 14:23:52 -07:00

branch.c

Merge branch 'nd/multiple-work-trees'

2015-05-11 14:23:39 -07:00

bundle.c

…

cat-file.c

Merge branch 'ah/usage-strings'

2015-02-11 13:44:20 -08:00

check-attr.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

check-ignore.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

check-mailmap.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

check-ref-format.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

checkout-index.c

prefix_path(): unconditionally free results in the callers

2015-05-05 10:31:51 -07:00

checkout.c

Merge branch 'nd/multiple-work-trees'

2015-05-11 14:23:39 -07:00

clean.c

Merge branch 'ja/clean-confirm-i18n'

2015-03-06 15:02:30 -08:00

clone.c

Merge branch 'nd/multiple-work-trees'

2015-05-11 14:23:39 -07:00

column.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

commit-tree.c

commit-tree: simplify parsing of option -S using skip_prefix()

2014-12-29 09:32:45 -08:00

commit.c

Merge branch 'pt/xdg-config-path'

2015-05-11 14:24:01 -07:00

config.c

Merge branch 'pt/xdg-config-path'

2015-05-11 14:24:01 -07:00

count-objects.c

count-objects: report unused files in $GIT_DIR/worktrees/...

2014-12-01 11:00:18 -08:00

credential.c

…

describe.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

diff-files.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

diff-index.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

diff-tree.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

diff.c

lockfile.h: extract new header file for the functions in lockfile.c

2014-10-01 13:56:14 -07:00

fast-export.c

…

fetch-pack.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

fetch.c

Merge branch 'nd/multiple-work-trees'

2015-05-11 14:23:39 -07:00

fmt-merge-msg.c

Merge branch 'jc/plug-fmt-merge-msg-leak'

2015-05-11 14:23:46 -07:00

for-each-ref.c

Merge branch 'rs/simple-cleanups' into maint

2015-03-06 14:57:57 -08:00

fsck.c

Merge branch 'nd/multiple-work-trees'

2015-05-11 14:23:39 -07:00

gc.c

Merge branch 'nd/multiple-work-trees'

2015-05-11 14:23:39 -07:00

get-tar-commit-id.c

use skip_prefix() to avoid more magic numbers

2014-10-07 11:09:16 -07:00

grep.c

Merge branch 'ps/grep-help-all-callback-arg'

2015-04-20 15:28:34 -07:00

hash-object.c

Merge branch 'jc/hash-object'

2015-05-11 14:23:59 -07:00

help.c

Merge branch 'sb/leaks'

2015-03-20 13:11:53 -07:00

index-pack.c

Merge branch 'nd/slim-index-pack-memory-usage'

2015-05-11 14:23:44 -07:00

init-db.c

Merge branch 'nd/multiple-work-trees'

2015-05-11 14:23:39 -07:00

interpret-trailers.c

trailer: add interpret-trailers command

2014-10-13 13:55:27 -07:00

log.c

Merge branch 'dk/format-patch-ignore-diff-submodule' into maint

2015-02-24 22:10:15 -08:00

ls-files.c

Merge branch 'jc/report-path-error-to-dir'

2015-03-26 11:57:13 -07:00

ls-remote.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

ls-tree.c

ls-tree: disable negative pathspec because it's not supported

2014-12-01 11:33:45 -08:00

mailinfo.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

mailsplit.c

mailsplit: remove unnecessary unlink(2) call

2014-10-07 10:49:57 -07:00

merge-base.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

merge-file.c

Merge branch 'ab/merge-file-prefix'

2015-02-22 12:28:25 -08:00

merge-index.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

Revert "merge: pass verbosity flag down to merge-recursive"

2015-04-16 08:03:14 -07:00

mktag.c

…

mktree.c

…

mv.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

name-rev.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

notes.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

pack-objects.c

Merge branch 'jk/sha1-file-reduce-useless-warnings'

2015-05-11 14:23:41 -07:00

pack-redundant.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

pack-refs.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

patch-id.c

patch-id: convert to use struct object_id

2015-03-13 22:43:14 -07:00

prune-packed.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

prune.c

Merge branch 'nd/multiple-work-trees'

2015-05-11 14:23:39 -07:00

push.c

push: allow --follow-tags to be set by config push.followTags

2015-03-14 15:08:35 -07:00

read-tree.c

lockfile.h: extract new header file for the functions in lockfile.c

2014-10-01 13:56:14 -07:00

receive-pack.c

Merge branch 'nd/multiple-work-trees'

2015-05-11 14:23:39 -07:00

reflog.c

reflog: improve and update documentation

2015-03-05 12:35:36 -08:00

remote-ext.c

use skip_prefix() to avoid more magic numbers

2014-10-07 11:09:16 -07:00

remote-fd.c

…

remote.c

Merge branch 'nd/multiple-work-trees'

2015-05-11 14:23:39 -07:00

repack.c

Merge branch 'nd/multiple-work-trees'

2015-05-11 14:23:39 -07:00

replace.c

ref_transaction_update(): remove "have_old" parameter

2015-02-17 11:22:50 -08:00

rerere.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

reset.c

lockfile.h: extract new header file for the functions in lockfile.c

2014-10-01 13:56:14 -07:00

rev-list.c

…

rev-parse.c

Merge branch 'nd/multiple-work-trees'

2015-05-11 14:23:39 -07:00

revert.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

rm.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

send-pack.c

send-pack.c: add --atomic command line argument

2015-01-07 19:56:44 -08:00

shortlog.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

show-branch.c

Merge branch 'mh/show-branch-topic'

2015-05-05 21:00:26 -07:00

show-ref.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

stripspace.c

…

symbolic-ref.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

tag.c

Merge branch 'jk/tag-h-column-is-a-listing-option'

2015-03-23 11:28:02 -07:00

unpack-file.c

…

unpack-objects.c

index-pack: terminate object buffers with NUL

2014-12-09 11:56:37 -08:00

update-index.c

prefix_path(): unconditionally free results in the callers

2015-05-05 10:31:51 -07:00

update-ref.c

ref_transaction_verify(): new function to check a reference's value

2015-02-17 11:24:59 -08:00

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-commit.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

verify-pack.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

verify-tag.c

standardize usage info string format

2015-01-14 09:32:04 -08:00

write-tree.c

…