diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-10-24 17:42:20 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-10-24 10:47:51 -0700 |
| commit | b42b45191950a4ac39f6f5ae042c15ad114da79b (patch) | |
| tree | d79debd6827d00ec3f5d4b9595bc2680c0d490b8 /Documentation | |
| parent | diff-lib: allow ita entries treated as "not yet exist in index" (diff) | |
| download | tgif-b42b45191950a4ac39f6f5ae042c15ad114da79b.tar.xz | |
diff: add --ita-[in]visible-in-index
The option --ita-invisible-in-index exposes the "ita_invisible_in_index"
diff flag to outside to allow easier experimentation with this new mode.
The "plan" is to make --ita-invisible-in-index default to keep consistent
behavior with 'status' and 'commit', but a bunch other commands like
'apply', 'merge', 'reset'.... need to be taken into consideration as well.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 2d77a19626..b249f6a2e7 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -570,5 +570,13 @@ endif::git-format-patch[] --line-prefix=<prefix>:: Prepend an additional prefix to every line of output. +--ita-invisible-in-index:: + By default entries added by "git add -N" appear as an existing + empty file in "git diff" and a new file in "git diff --cached". + This option makes the entry appear as a new file in "git diff" + and non-existent in "git diff --cached". This option could be + reverted with `--ita-visible-in-index`. Both options are + experimental and could be removed in future. + For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]. |