{"thread":{"id":"17213","subject":"[PATCH] Documentation: let asciidoc align related options","startedAt":"2009-01-16T21:42:33Z","lastAt":"2009-01-16T21:42:33Z","messageCount":1,"participants":["Markus Heidelberg"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"100778","messageId":"200901162242.34020.markus.heidelberg@web.de","threadId":"17213","inReplyTo":null,"subject":"[PATCH] Documentation: let asciidoc align related options","fromName":"Markus Heidelberg","fromEmail":"markus.heidelberg@web.de","sentAt":"2009-01-16T21:42:33Z","receivedAt":"2009-01-16T21:42:33Z","isPatch":true,"sender":{"key":"markus.heidelberg@web.de","avatar":"https://avatars.githubusercontent.com/u/6334512?v=4"},"body":"Command line options can share the same paragraph of description, if\nthey are related or synonymous. In these cases they should be written\namong each other, so that asciidoc can format them itself.\n\nThis also fixes the description of the -t option in git-mergetool.\n\nSigned-off-by: Markus Heidelberg <markus.heidelberg@web.de>\n---\n\n\tI'm not quite sure about the options in git-diff-files, maybe\n\tthere is a better solution. But at least I think, additional\n\twords between the options should be avoided, because they add\n\tconfusion.\n\n Documentation/git-diff-files.txt |    5 ++++-\n Documentation/git-mergetool.txt  |    6 ++++--\n 2 files changed, 8 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt\nindex 5c8c1d9..c526141 100644\n--- a/Documentation/git-diff-files.txt\n+++ b/Documentation/git-diff-files.txt\n@@ -21,7 +21,10 @@ OPTIONS\n -------\n include::diff-options.txt[]\n \n--1 -2 -3 or --base --ours --theirs, and -0::\n+-1 --base::\n+-2 --ours::\n+-3 --theirs::\n+-0::\n \tDiff against the \"base\" version, \"our branch\" or \"their\n \tbranch\" respectively.  With these options, diffs for\n \tmerged entries are not shown.\ndiff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt\nindex 4c0ffec..5d3c632 100644\n--- a/Documentation/git-mergetool.txt\n+++ b/Documentation/git-mergetool.txt\n@@ -22,7 +22,8 @@ with merge conflicts.\n \n OPTIONS\n -------\n--t or --tool=<tool>::\n+-t <tool>::\n+--tool=<tool>::\n \tUse the merge resolution program specified by <tool>.\n \tValid merge tools are:\n \tkdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff\n@@ -60,7 +61,8 @@ variable `mergetool.<tool>.trustExitCode` can be set to `true`.\n Otherwise, 'git-mergetool' will prompt the user to indicate the\n success of the resolution after the custom tool has exited.\n \n--y or --no-prompt::\n+-y::\n+--no-prompt::\n \tDon't prompt before each invocation of the merge resolution\n \tprogram.\n \n-- \n1.6.1.35.g0c23\n"}]}