fixup! [PATCH 2/6] doc: align 'diff --no-index' in text with synopsis

2018-04-11 Thread Andreas Heiduk
Signed-off-by: Andreas Heiduk --- Documentation/git-diff.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index ee1c509bd3..6593b58299 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -13

Re: [PATCH 2/6] doc: align 'diff --no-index' in text with synopsis

2018-04-10 Thread Junio C Hamano
Andreas Heiduk writes: > > -'git diff' --no-index [--options] [--] [...]:: > +'git diff' [--options] [--no-index] [--] :: > > This form is to compare the given two paths on the > filesystem. You can omit the `--no-index` option when It definitely is a good change to show two (a

Re: [PATCH 2/6] doc: align 'diff --no-index' in text with synopsis

2018-04-10 Thread Andreas Heiduk
Am 10.04.2018 um 21:14 schrieb Martin Ågren: > On 10 April 2018 at 20:32, Andreas Heiduk wrote: >> Comparing > > That first line should probably not be there. The diff LGTM. > > Martin > ACK, Thanks

Re: [PATCH 2/6] doc: align 'diff --no-index' in text with synopsis

2018-04-10 Thread Martin Ågren
On 10 April 2018 at 20:32, Andreas Heiduk wrote: > Comparing > The two '' parameters are not optional but the option > '--no-index' is. Also move the `--options` part to the same > place where the other variants show them. That first line should probably not be there. The diff LGTM. Martin

[PATCH 2/6] doc: align 'diff --no-index' in text with synopsis

2018-04-10 Thread Andreas Heiduk
Comparing The two '' parameters are not optional but the option '--no-index' is. Also move the `--options` part to the same place where the other variants show them. All three items are already correct in the synopsis. Signed-off-by: Andreas Heiduk --- Documentation/git-diff.txt | 2 +- 1 file