{"thread":{"id":"7099","subject":"[PATCH] Fix diff-options references in git-diff and git-format-patch","startedAt":"2007-03-06T03:27:44Z","lastAt":"2007-03-06T03:27:44Z","messageCount":1,"participants":["Brian Gernhardt"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"36411","messageId":"20070306032744.GA15330@Hermes.local","threadId":"7099","inReplyTo":null,"subject":"[PATCH] Fix diff-options references in git-diff and git-format-patch","fromName":"Brian Gernhardt","fromEmail":"benji@silverinsanity.com","sentAt":"2007-03-06T03:27:44Z","receivedAt":"2007-03-06T03:27:44Z","isPatch":true,"sender":{"key":"benji@silverinsanity.com","avatar":"https://gravatar.com/avatar/e06c101dbc25c68114d859b4a9ec7cf8a2c52fd2b0270ef0eac0e2e63ff22311?d=mp&s=160"},"body":"Most of the git-diff-* documentation used [<common diff options>]\ninstead of [--diff-options], so make that change in git-diff and\ngit-format-patch.\n\nIn addition, git-format-patch didn't include the meanings of the diff\noptions.\n\nSigned-off-by: Brian Gernhardt <benji@silverinsanity.com>\n---\n\nOn Mar 5, 2007, at 6:14 PM, Johannes Schindelin wrote:\n\n> Actually, it is described briefly in the synopsis. But not in the\n> options section. Care to provide a patch (see git-log.txt for an\n> example how to include the diff options)?\n\nSomething like this?\n\n Documentation/git-diff.txt         |    2 +-\n Documentation/git-format-patch.txt |    6 ++++--\n 2 files changed, 5 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\nindex 12a531d..044cee9 100644\n--- a/Documentation/git-diff.txt\n+++ b/Documentation/git-diff.txt\n@@ -8,7 +8,7 @@ git-diff - Show changes between commits, commit and working tree, etc\n \n SYNOPSIS\n --------\n-'git-diff' [ --diff-options ] <commit>{0,2} [--] [<path>...]\n+'git-diff' [<common diff options>] <commit>{0,2} [--] [<path>...]\n \n DESCRIPTION\n -----------\ndiff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt\nindex 59f34b9..84eabeb 100644\n--- a/Documentation/git-format-patch.txt\n+++ b/Documentation/git-format-patch.txt\n@@ -9,8 +9,8 @@ git-format-patch - Prepare patches for e-mail submission\n SYNOPSIS\n --------\n [verse]\n-'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--attach] [--thread]\n-\t           [-s | --signoff] [--diff-options] [--start-number <n>]\n+'git-format-patch' [<common diff options>] [-n | -k] [-o <dir> | --stdout]\n+\t\t   [--attach] [--thread] [-s | --signoff] [--start-number <n>]\n \t\t   [--in-reply-to=Message-Id] [--suffix=.<sfx>]\n \t\t   [--ignore-if-in-upstream]\n \t\t   <since>[..<until>]\n@@ -46,6 +46,8 @@ reference.\n \n OPTIONS\n -------\n+include::diff-options.txt[]\n+\n -o|--output-directory <dir>::\n \tUse <dir> to store the resulting files, instead of the\n \tcurrent working directory.\n-- \n1.5.0.3.271.g5ced\n"}]}