Fix diff-options references in git-diff and git-format-patch
Most of the git-diff-* documentation used [<common diff options>] instead of [--diff-options], so make that change in git-diff and git-format-patch. In addition, git-format-patch didn't include the meanings of the diff options. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Brian Gernhardt committed
Mar 5, 2007 at 22:27 UTC
b8105375abfeee54e0a34e1c290983fd15e743cf
2 files changed
+5
-3
Documentation/git-diff.txt
+1
-1
@@ -8,7 +8,7 @@ git-diff - Show changes between commits, commit and working tree, etc
8
9
SYNOPSIS
10
--------
11
-'git-diff' [ --diff-options ] <commit>{0,2} [--] [<path>...]
11
+'git-diff' [<common diff options>] <commit>{0,2} [--] [<path>...]
12
13
DESCRIPTION
14
-----------
Documentation/git-format-patch.txt
+4
-2
@@ -9,8 +9,8 @@ git-format-patch - Prepare patches for e-mail submission
9
SYNOPSIS
10
--------
11
[verse]
12
-'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--attach] [--thread]
13
- [-s | --signoff] [--diff-options] [--start-number <n>]
12
+'git-format-patch' [<common diff options>] [-n | -k] [-o <dir> | --stdout]
13
+ [--attach] [--thread] [-s | --signoff] [--start-number <n>]
14
[--in-reply-to=Message-Id] [--suffix=.<sfx>]
15
[--ignore-if-in-upstream]
16
<since>[..<until>]
@@ -46,6 +46,8 @@ reference.
46
47
OPTIONS
48
-------
49
+include::diff-options.txt[]
50
+
51
-o|--output-directory <dir>::
52
Use <dir> to store the resulting files, instead of the
53
current working directory.