{"thread":{"id":"25910","subject":"[PATCH] git-branch.txt: order options alphabetically","startedAt":"2010-12-01T20:26:41Z","lastAt":"2010-12-01T20:26:41Z","messageCount":1,"participants":["jari.aalto@cante.net"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"157013","messageId":"1291235201-21651-1-git-send-email-jari.aalto@cante.net","threadId":"25910","inReplyTo":null,"subject":"[PATCH] git-branch.txt: order options alphabetically","fromName":"","fromEmail":"jari.aalto@cante.net","sentAt":"2010-12-01T20:26:41Z","receivedAt":"2010-12-01T20:26:41Z","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-branch.txt |  108 +++++++++++++++++++++---------------------\n 1 files changed, 54 insertions(+), 54 deletions(-)\n\ndiff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt\nindex 9106d38..b4a56f9 100644\n--- a/Documentation/git-branch.txt\n+++ b/Documentation/git-branch.txt\n@@ -63,6 +63,23 @@ way to clean up all obsolete remote-tracking branches.\n \n OPTIONS\n -------\n+\n+-a::\n+\tList both remote-tracking branches and local branches.\n+\n+--abbrev=<length>::\n+\tAlter the sha1's minimum display length in the output listing.\n+\tThe default value is 7.  See also `--no-abbrev'.\n+\n+--color[=<when>]::\n+\tColor branches to highlight current, local, and\n+\tremote-tracking branches.\n+\tThe value must be always (the default), never, or auto.  See\n+\talso `--no-color'.\n+\n+--contains <commit>::\n+\tOnly list branches which contain the specified commit.\n+\n -d::\n \tDelete a branch. The branch must be fully merged in its\n \tupstream branch, or in `HEAD` if no upstream was set with\n@@ -71,6 +88,11 @@ OPTIONS\n -D::\n \tDelete a branch irrespective of its merged status.\n \n+-f::\n+--force::\n+\tReset <branchname> to <startpoint> if <branchname> exists\n+\talready. Without `-f` 'git branch' refuses to change an existing branch.\n+\n -l::\n \tCreate the branch's reflog.  This activates recording of\n \tall changes made to the branch ref, enabling use of date\n@@ -78,45 +100,39 @@ OPTIONS\n \tNote that in non-bare repositories, reflogs are usually\n \tenabled by default by the `core.logallrefupdates` config option.\n \n--f::\n---force::\n-\tReset <branchname> to <startpoint> if <branchname> exists\n-\talready. Without `-f` 'git branch' refuses to change an existing branch.\n-\n -m::\n \tMove/rename a branch and the corresponding reflog.\n \n+--merged [<commit>]::\n+\tOnly list branches whose tips are reachable from the\n+\tspecified commit (HEAD if not specified).  See also `--no-merged'.\n+\n -M::\n \tMove/rename a branch even if the new branch name already exists.\n \n---color[=<when>]::\n-\tColor branches to highlight current, local, and\n-\tremote-tracking branches.\n-\tThe value must be always (the default), never, or auto.\n+--no-abbrev::\n+\tDisplay the full sha1s in the output listing rather than abbreviating them.\n \n --no-color::\n \tTurn off branch colors, even when the configuration file gives the\n-\tdefault to color output.\n-\tSame as `--color=never`.\n+\tdefault to color output.  Same as `--color=never`.\n \n--r::\n-\tList or delete (if used with -d) the remote-tracking branches.\n-\n--a::\n-\tList both remote-tracking branches and local branches.\n+--no-merged [<commit>]::\n+\tOnly list branches whose tips are not reachable from the\n+\tspecified commit (HEAD if not specified).\n \n--v::\n---verbose::\n-\tShow sha1 and commit subject line for each head, along with\n-\trelationship to upstream branch (if any). If given twice, print\n-\tthe name of the upstream branch, as well.\n+--no-track::\n+\tDo not set up \"upstream\" configuration, even if the\n+\tbranch.autosetupmerge configuration variable is true.\n \n---abbrev=<length>::\n-\tAlter the sha1's minimum display length in the output listing.\n-\tThe default value is 7.\n+-r::\n+\tList or delete (if used with -d) the remote-tracking branches.\n \n---no-abbrev::\n-\tDisplay the full sha1s in the output listing rather than abbreviating them.\n+--set-upstream::\n+\tIf specified branch does not exist yet or if '--force' has been\n+\tgiven, acts exactly like '--track'. Otherwise sets up configuration\n+\tlike '--track' would when creating the branch, except that where\n+\tbranch points to is not changed.\n \n -t::\n --track::\n@@ -133,26 +149,11 @@ want `git checkout` and `git branch` to always behave as if '--no-track'\n were given. Set it to `always` if you want this behavior when the\n start-point is either a local or remote-tracking branch.\n \n---no-track::\n-\tDo not set up \"upstream\" configuration, even if the\n-\tbranch.autosetupmerge configuration variable is true.\n-\n---set-upstream::\n-\tIf specified branch does not exist yet or if '--force' has been\n-\tgiven, acts exactly like '--track'. Otherwise sets up configuration\n-\tlike '--track' would when creating the branch, except that where\n-\tbranch points to is not changed.\n-\n---contains <commit>::\n-\tOnly list branches which contain the specified commit.\n-\n---merged [<commit>]::\n-\tOnly list branches whose tips are reachable from the\n-\tspecified commit (HEAD if not specified).\n-\n---no-merged [<commit>]::\n-\tOnly list branches whose tips are not reachable from the\n-\tspecified commit (HEAD if not specified).\n+-v::\n+--verbose::\n+\tShow sha1 and commit subject line for each head, along with\n+\trelationship to upstream branch (if any). If given twice, print\n+\tthe name of the upstream branch, as well.\n \n <branchname>::\n \tThe name of the branch to create or delete.\n@@ -160,18 +161,17 @@ start-point is either a local or remote-tracking branch.\n \tlinkgit:git-check-ref-format[1].  Some of these checks\n \tmay restrict the characters allowed in a branch name.\n \n-<start-point>::\n-\tThe new branch head will point to this commit.  It may be\n-\tgiven as a branch name, a commit-id, or a tag.  If this\n-\toption is omitted, the current HEAD will be used instead.\n-\n-<oldbranch>::\n-\tThe name of an existing branch to rename.\n-\n <newbranch>::\n \tThe new name for an existing branch. The same restrictions as for\n \t<branchname> apply.\n \n+<oldbranch>::\n+\tThe name of an existing branch to rename.\n+\n+<start-point>::\n+\tThe new branch head will point to this commit.  It may be\n+\tgiven as a branch name, a commit-id, or a tag.  If this\n+\toption is omitted, the current HEAD will be used instead.\n \n Examples\n --------\n-- \n1.7.2.3\n"}]}