{"thread":{"id":"25911","subject":"[PATCH] git-ls-files.txt: order options alphabetically","startedAt":"2010-12-01T20:31:29Z","lastAt":"2010-12-01T20:31:29Z","messageCount":1,"participants":["jari.aalto@cante.net"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"157014","messageId":"1291235489-21802-1-git-send-email-jari.aalto@cante.net","threadId":"25911","inReplyTo":null,"subject":"[PATCH] git-ls-files.txt: order options alphabetically","fromName":"","fromEmail":"jari.aalto@cante.net","sentAt":"2010-12-01T20:31:29Z","receivedAt":"2010-12-01T20:31:29Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"From: Jari Aalto <jari.aalto@cante.net>\n\n\nSigned-off-by: Jari Aalto <jari.aalto@cante.net>\n---\n Documentation/git-ls-files.txt |  123 ++++++++++++++++++++--------------------\n 1 files changed, 62 insertions(+), 61 deletions(-)\n\ndiff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt\nindex 86abd13..4b88940 100644\n--- a/Documentation/git-ls-files.txt\n+++ b/Documentation/git-ls-files.txt\n@@ -30,6 +30,15 @@ shown:\n \n OPTIONS\n -------\n+\n+\\--::\n+\tDo not interpret any more arguments as options.\n+\n+--abbrev[=<n>]::\n+\tInstead of showing the full 40-byte hexadecimal object\n+\tlines, show only a partial prefix.\n+\tNon default number of digits can be specified with --abbrev=<n>.\n+\n -c::\n --cached::\n \tShow cached files in the output (default)\n@@ -38,53 +47,32 @@ OPTIONS\n --deleted::\n \tShow deleted files in the output\n \n--m::\n---modified::\n-\tShow modified files in the output\n-\n--o::\n---others::\n-\tShow other (i.e. untracked) files in the output\n-\n--i::\n---ignored::\n-\tShow only ignored files in the output. When showing files in the\n-\tindex, print only those matched by an exclude pattern. When\n-\tshowing \"other\" files, show only those matched by an exclude\n-\tpattern.\n-\n--s::\n---stage::\n-\tShow staged contents' object name, mode bits and stage number in the output.\n+--debug::\n+\tAfter each line that describes a file, add more data about its\n+\tcache entry.  This is intended to show as much information as\n+\tpossible for manual inspection; the exact format may change at\n+\tany time.\n \n --directory::\n+--no-empty-directory::\n \tIf a whole directory is classified as \"other\", show just its\n \tname (with a trailing slash) and not its whole contents.\n \n---no-empty-directory::\n-\tDo not list empty directories. Has no effect without --directory.\n-\n--u::\n---unmerged::\n-\tShow unmerged files in the output (forces --stage)\n+\tAlternatively do not list empty directories. Has no effect\n+\twithout `--directory'.\n \n--k::\n---killed::\n-\tShow files on the filesystem that need to be removed due\n-\tto file/directory conflicts for checkout-index to\n-\tsucceed.\n-\n--z::\n-\t\\0 line termination on output.\n+--error-unmatch::\n+\tIf any <file> does not appear in the index, treat this as an\n+\terror (return 1).\n \n--x <pattern>::\n --exclude=<pattern>::\n+-x <pattern>::\n \tSkip untracked files matching pattern.\n \tNote that pattern is a shell wildcard pattern. See EXCLUDE PATTERNS\n \tbelow for more information.\n \n--X <file>::\n --exclude-from=<file>::\n+-X <file>::\n \tRead exclude patterns from <file>; 1 per line.\n \n --exclude-per-directory=<file>::\n@@ -95,16 +83,36 @@ OPTIONS\n \tAdd the standard git exclusions: .git/info/exclude, .gitignore\n \tin each directory, and the user's global exclusion file.\n \n---error-unmatch::\n-\tIf any <file> does not appear in the index, treat this as an\n-\terror (return 1).\n+--full-name::\n+\tWhen run from a subdirectory, the command usually\n+\toutputs paths relative to the current directory.  This\n+\toption forces paths to be output relative to the project\n+\ttop directory.\n \n---with-tree=<tree-ish>::\n-\tWhen using --error-unmatch to expand the user supplied\n-\t<file> (i.e. path pattern) arguments to paths, pretend\n-\tthat paths which were removed in the index since the\n-\tnamed <tree-ish> are still present.  Using this option\n-\twith `-s` or `-u` options does not make any sense.\n+-i::\n+--ignored::\n+\tShow only ignored files in the output. When showing files in the\n+\tindex, print only those matched by an exclude pattern. When\n+\tshowing \"other\" files, show only those matched by an exclude\n+\tpattern.\n+\n+-k::\n+--killed::\n+\tShow files on the filesystem that need to be removed due\n+\tto file/directory conflicts for checkout-index to\n+\tsucceed.\n+\n+-m::\n+--modified::\n+\tShow modified files in the output\n+\n+-o::\n+--others::\n+\tShow other (i.e. untracked) files in the output\n+\n+-s::\n+--stage::\n+\tShow staged contents' object name, mode bits and stage number in the output.\n \n -t::\n \tThis feature is semi-deprecated. For scripting purpose,\n@@ -124,31 +132,24 @@ a space) at the start of each line:\n \tC::\tmodified/changed\n \tK::\tto be killed\n \t?::\tother\n+-u::\n+--unmerged::\n+\tShow unmerged files in the output (forces --stage)\n \n -v::\n \tSimilar to `-t`, but use lowercase letters for files\n \tthat are marked as 'assume unchanged' (see\n \tlinkgit:git-update-index[1]).\n \n---full-name::\n-\tWhen run from a subdirectory, the command usually\n-\toutputs paths relative to the current directory.  This\n-\toption forces paths to be output relative to the project\n-\ttop directory.\n-\n---abbrev[=<n>]::\n-\tInstead of showing the full 40-byte hexadecimal object\n-\tlines, show only a partial prefix.\n-\tNon default number of digits can be specified with --abbrev=<n>.\n-\n---debug::\n-\tAfter each line that describes a file, add more data about its\n-\tcache entry.  This is intended to show as much information as\n-\tpossible for manual inspection; the exact format may change at\n-\tany time.\n+--with-tree=<tree-ish>::\n+\tWhen using --error-unmatch to expand the user supplied\n+\t<file> (i.e. path pattern) arguments to paths, pretend\n+\tthat paths which were removed in the index since the\n+\tnamed <tree-ish> are still present.  Using this option\n+\twith `-s` or `-u` options does not make any sense.\n \n-\\--::\n-\tDo not interpret any more arguments as options.\n+-z::\n+\t\\0 line termination on output.\n \n <file>::\n \tFiles to show. If no files are given all files which match the other\n-- \n1.7.2.3\n"}]}