diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-27 14:58:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-27 14:58:50 -0700 |
| commit | 650360210afbd585f33ed622d3e700b1941b1ddb (patch) | |
| tree | 52a6857344b7e569f5fa3557cf4cd7827166f7c9 /Documentation | |
| parent | cca3be6ea15b07f22dcb1198a8c23193481ae2e7 (diff) | |
| parent | 2c49f7ffb3063fdccccf2a038ab2eee66e7395e4 (diff) | |
| download | git-650360210afbd585f33ed622d3e700b1941b1ddb.tar.gz git-650360210afbd585f33ed622d3e700b1941b1ddb.tar.xz | |
Merge branch 'nd/ita-empty-commit'
When new paths were added by "git add -N" to the index, it was
enough to circumvent the check by "git commit" to refrain from
making an empty commit without "--allow-empty". The same logic
prevented "git status" to show such a path as "new file" in the
"Changes not staged for commit" section.
* nd/ita-empty-commit:
commit: don't be fooled by ita entries when creating initial commit
commit: fix empty commit creation when there's no changes but ita entries
diff: add --ita-[in]visible-in-index
diff-lib: allow ita entries treated as "not yet exist in index"
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 29630c238..e6215c372 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -572,5 +572,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]. |