diff options
| author |  Andreas Heiduk <asheiduk@gmail.com> | 2018-05-03 20:48:25 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-06 18:38:43 +0900 |
| commit | e78e0f728eb043dc99de10fb3b4d58575f2df0c9 (patch) | |
| tree | 859666653b370221424d4e7809c0d57a08525c03 /Documentation/git-diff.txt | |
| parent | doc: improve formatting in githooks.txt (diff) | |
| download | tgif-e78e0f728eb043dc99de10fb3b4d58575f2df0c9.tar.xz | |
doc: align 'diff --no-index' in text and synopsis
Make the two '<path>' parameters in DESCRIPTION mandatory and
move the `--options` part to the same place where the other
variants show them. And finally make `--no-index` in SYNOPSIS
as mandatory as in DESCRIPTION.
Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
Reviewed-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-diff.txt')
| -rw-r--r-- | Documentation/git-diff.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index b0c1bb95c8..6593b58299 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -13,7 +13,7 @@ SYNOPSIS 'git diff' [options] --cached [<commit>] [--] [<path>...] 'git diff' [options] <commit> <commit> [--] [<path>...] 'git diff' [options] <blob> <blob> -'git diff' [options] [--no-index] [--] <path> <path> +'git diff' [options] --no-index [--] <path> <path> DESCRIPTION ----------- @@ -29,7 +29,7 @@ two blob objects, or changes between two files on disk. further add to the index but you still haven't. You can stage these changes by using linkgit:git-add[1]. -'git diff' --no-index [--options] [--] [<path>...]:: +'git diff' [--options] --no-index [--] <path> <path>:: This form is to compare the given two paths on the filesystem. You can omit the `--no-index` option when |