diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-07-13 11:24:14 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-13 11:24:14 -0700 |
commit | ce18123cec7674b58bb57272fdfa28de6ecc6b18 (patch) | |
tree | fce7f39f74bb41dd3dc6d730752c24fc4ddda2c9 /Documentation/git-diff-index.txt | |
parent | Merge branch 'dg/subtree-rebase-test' (diff) | |
parent | doc: typeset HEAD and variants as literal (diff) | |
download | tgif-ce18123cec7674b58bb57272fdfa28de6ecc6b18.tar.xz |
Merge branch 'mm/doc-tt'
More mark-up updates to typeset strings that are expected to
literally typed by the end user in fixed-width font.
* mm/doc-tt:
doc: typeset HEAD and variants as literal
CodingGuidelines: formatting HEAD in documentation
doc: typeset long options with argument as literal
doc: typeset '--' as literal
doc: typeset long command-line options as literal
doc: typeset short command-line options as literal
Documentation/git-mv.txt: fix whitespace indentation
Diffstat (limited to 'Documentation/git-diff-index.txt')
-rw-r--r-- | Documentation/git-diff-index.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt index a86cf62e68..a171506952 100644 --- a/Documentation/git-diff-index.txt +++ b/Documentation/git-diff-index.txt @@ -40,13 +40,13 @@ include::diff-format.txt[] Operating Modes --------------- You can choose whether you want to trust the index file entirely -(using the '--cached' flag) or ask the diff logic to show any files +(using the `--cached` flag) or ask the diff logic to show any files that don't match the stat state as being "tentatively changed". Both of these operations are very useful indeed. Cached Mode ----------- -If '--cached' is specified, it allows you to ask: +If `--cached` is specified, it allows you to ask: show me the differences between HEAD and the current index contents (the ones I'd write using 'git write-tree') |