git/Documentation/diff-options.txt, branch v2.14.2

Merge branch 'ah/doc-wserrorhighlight' into maint

2017-08-23T21:33:51Z

Doc update. * ah/doc-wserrorhighlight: doc: add missing values "none" and "default" for diff.wsErrorHighlight

diff-options doc: grammar fix

2017-07-31T16:57:12Z

Signed-off-by: Anthony Sottile Signed-off-by: Junio C Hamano

doc: add missing values "none" and "default" for diff.wsErrorHighlight

2017-07-25T21:30:49Z

The values have eluded documentation so far. While at it streamline the wording by grouping relevant parts together. Signed-off-by: Andreas Heiduk Signed-off-by: Junio C Hamano

Documentation: improve description for core.quotePath

2017-03-02T19:40:51Z

Linking the description for pathname quoting to the configuration variable "core.quotePath" removes inconstistent and incomplete sections while also giving two hints how to deal with it: Either with "-c core.quotePath=false" or with "-z". Signed-off-by: Andreas Heiduk Signed-off-by: Junio C Hamano

Merge branch 'rh/diff-orderfile-doc'

2017-01-23T23:59:23Z

Documentation fix. * rh/diff-orderfile-doc: diff: document the format of the -O (diff.orderFile) file diff: document behavior of relative diff.orderFile

diff: document the format of the -O (diff.orderFile) file

2017-01-16T00:42:16Z

Signed-off-by: Richard Hansen Signed-off-by: Junio C Hamano

diff: add interhunk context config option

2017-01-12T20:55:43Z

The --inter-hunk-context= option was added in commit 6d0e674a5754 ("diff: add option to show context between close hunks"). This patch allows configuring a default for this option. Signed-off-by: Vegard Nossum Signed-off-by: Junio C Hamano

Merge branch 'nd/ita-empty-commit'

2016-10-27T21:58:50Z

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"

Merge branch 'jc/ws-error-highlight'

2016-10-26T20:14:43Z

"git diff/log --ws-error-highlight=" lacked the corresponding configuration variable to set it by default. * jc/ws-error-highlight: diff: introduce diff.wsErrorHighlight option diff.c: move ws-error-highlight parsing helpers up diff.c: refactor parse_ws_error_highlight() t4015: split out the "setup" part of ws-error-highlight test

diff: add --ita-[in]visible-in-index

2016-10-24T17:47:51Z

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 Signed-off-by: Junio C Hamano