{"thread":{"id":"25907","subject":"[PATCH] git-push.txt: order options alphabetically","startedAt":"2010-12-01T20:12:25Z","lastAt":"2010-12-01T20:12:25Z","messageCount":1,"participants":["jari.aalto@cante.net"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"157008","messageId":"1291234345-21070-1-git-send-email-jari.aalto@cante.net","threadId":"25907","inReplyTo":null,"subject":"[PATCH] git-push.txt: order options alphabetically","fromName":"","fromEmail":"jari.aalto@cante.net","sentAt":"2010-12-01T20:12:25Z","receivedAt":"2010-12-01T20:12:25Z","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-push.txt |  142 ++++++++++++++++++++++----------------------\n 1 files changed, 72 insertions(+), 70 deletions(-)\n\ndiff --git a/Documentation/git-push.txt b/Documentation/git-push.txt\nindex e11660a..0cc5b88 100644\n--- a/Documentation/git-push.txt\n+++ b/Documentation/git-push.txt\n@@ -26,51 +26,22 @@ documentation for linkgit:git-receive-pack[1].\n \n OPTIONS[[OPTIONS]]\n ------------------\n-<repository>::\n-\tThe \"remote\" repository that is destination of a push\n-\toperation.  This parameter can be either a URL\n-\t(see the section <<URLS,GIT URLS>> below) or the name\n-\tof a remote (see the section <<REMOTES,REMOTES>> below).\n-\n-<refspec>...::\n-\tThe format of a <refspec> parameter is an optional plus\n-\t`{plus}`, followed by the source ref <src>, followed\n-\tby a colon `:`, followed by the destination ref <dst>.\n-\tIt is used to specify with what <src> object the <dst> ref\n-\tin the remote repository is to be updated.\n-+\n-The <src> is often the name of the branch you would want to push, but\n-it can be any arbitrary \"SHA-1 expression\", such as `master~4` or\n-`HEAD` (see linkgit:gitrevisions[7]).\n-+\n-The <dst> tells which ref on the remote side is updated with this\n-push. Arbitrary expressions cannot be used here, an actual ref must\n-be named. If `:`<dst> is omitted, the same ref as <src> will be\n-updated.\n-+\n-The object referenced by <src> is used to update the <dst> reference\n-on the remote side, but by default this is only allowed if the\n-update can fast-forward <dst>.  By having the optional leading `{plus}`,\n-you can tell git to update the <dst> ref even when the update is not a\n-fast-forward.  This does *not* attempt to merge <src> into <dst>.  See\n-EXAMPLES below for details.\n-+\n-`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.\n-+\n-Pushing an empty <src> allows you to delete the <dst> ref from\n-the remote repository.\n-+\n-The special refspec `:` (or `{plus}:` to allow non-fast-forward updates)\n-directs git to push \"matching\" branches: for every branch that exists on\n-the local side, the remote side is updated if a branch of the same name\n-already exists on the remote side.  This is the default operation mode\n-if no explicit refspec is found (that is neither on the command line\n-nor in any Push line of the corresponding remotes file---see below).\n \n --all::\n \tInstead of naming each ref to push, specifies that all\n \trefs under `refs/heads/` be pushed.\n \n+--delete::\n+\tAll listed refs are deleted from the remote repository. This is\n+\tthe same as prefixing all refs with a colon.\n+\n+-f::\n+--force::\n+\tUsually, the command refuses to update a remote ref that is\n+\tnot an ancestor of the local ref used to overwrite it.\n+\tThis flag disables the check.  This can cause the\n+\tremote repository to lose commits; use it with care.\n+\n --mirror::\n \tInstead of naming each ref to push, specifies that all\n \trefs under `refs/` (which includes but is not\n@@ -91,14 +62,17 @@ nor in any Push line of the corresponding remotes file---see below).\n \twill be tab-separated and sent to stdout instead of stderr.  The full\n \tsymbolic names of the refs will be given.\n \n---delete::\n-\tAll listed refs are deleted from the remote repository. This is\n-\tthe same as prefixing all refs with a colon.\n+--progress::\n+\tProgress status is reported on the standard error stream\n+\tby default when it is attached to a terminal, unless -q\n+\tis specified. This flag forces progress status even if the\n+\tstandard error stream is not directed to a terminal.\n \n---tags::\n-\tAll refs under `refs/tags` are pushed, in\n-\taddition to refspecs explicitly listed on the command\n-\tline.\n+-q::\n+--quiet::\n+\tSuppress all output, including the listing of updated refs,\n+\tunless an error occurs. Progress is not reported to the standard\n+\terror stream.\n \n --receive-pack=<git-receive-pack>::\n --exec=<git-receive-pack>::\n@@ -107,13 +81,6 @@ nor in any Push line of the corresponding remotes file---see below).\n \trepository over ssh, and you do not have the program in\n \ta directory on the default $PATH.\n \n--f::\n---force::\n-\tUsually, the command refuses to update a remote ref that is\n-\tnot an ancestor of the local ref used to overwrite it.\n-\tThis flag disables the check.  This can cause the\n-\tremote repository to lose commits; use it with care.\n-\n --repo=<repository>::\n \tThis option is only relevant if no <repository> argument is\n \tpassed in the invocation. In this case, 'git push' derives the\n@@ -132,12 +99,10 @@ is that #1 always pushes to \"public\" whereas #2 pushes to \"public\"\n only if the current branch does not track a remote branch. This is\n useful if you write an alias or script around 'git push'.\n \n--u::\n---set-upstream::\n-\tFor every branch that is up to date or successfully pushed, add\n-\tupstream (tracking) reference, used by argument-less\n-\tlinkgit:git-pull[1] and other commands. For more information,\n-\tsee 'branch.<name>.merge' in linkgit:git-config[1].\n+--tags::\n+\tAll refs under `refs/tags` are pushed, in\n+\taddition to refspecs explicitly listed on the command\n+\tline.\n \n --thin::\n --no-thin::\n@@ -146,21 +111,58 @@ useful if you write an alias or script around 'git push'.\n \treceiver share many of the same objects in common. The default is\n \t\\--thin.\n \n--q::\n---quiet::\n-\tSuppress all output, including the listing of updated refs,\n-\tunless an error occurs. Progress is not reported to the standard\n-\terror stream.\n+-u::\n+--set-upstream::\n+\tFor every branch that is up to date or successfully pushed, add\n+\tupstream (tracking) reference, used by argument-less\n+\tlinkgit:git-pull[1] and other commands. For more information,\n+\tsee 'branch.<name>.merge' in linkgit:git-config[1].\n \n -v::\n --verbose::\n \tRun verbosely.\n \n---progress::\n-\tProgress status is reported on the standard error stream\n-\tby default when it is attached to a terminal, unless -q\n-\tis specified. This flag forces progress status even if the\n-\tstandard error stream is not directed to a terminal.\n+<refspec>...::\n+\tThe format of a <refspec> parameter is an optional plus\n+\t`{plus}`, followed by the source ref <src>, followed\n+\tby a colon `:`, followed by the destination ref <dst>.\n+\tIt is used to specify with what <src> object the <dst> ref\n+\tin the remote repository is to be updated.\n++\n+The <src> is often the name of the branch you would want to push, but\n+it can be any arbitrary \"SHA-1 expression\", such as `master~4` or\n+`HEAD` (see linkgit:gitrevisions[7]).\n++\n+The <dst> tells which ref on the remote side is updated with this\n+push. Arbitrary expressions cannot be used here, an actual ref must\n+be named. If `:`<dst> is omitted, the same ref as <src> will be\n+updated.\n++\n+The object referenced by <src> is used to update the <dst> reference\n+on the remote side, but by default this is only allowed if the\n+update can fast-forward <dst>.  By having the optional leading `{plus}`,\n+you can tell git to update the <dst> ref even when the update is not a\n+fast-forward.  This does *not* attempt to merge <src> into <dst>.  See\n+EXAMPLES below for details.\n++\n+`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`.\n++\n+Pushing an empty <src> allows you to delete the <dst> ref from\n+the remote repository.\n++\n+The special refspec `:` (or `{plus}:` to allow non-fast-forward updates)\n+directs git to push \"matching\" branches: for every branch that exists on\n+the local side, the remote side is updated if a branch of the same name\n+already exists on the remote side.  This is the default operation mode\n+if no explicit refspec is found (that is neither on the command line\n+nor in any Push line of the corresponding remotes file---see below).\n+\n+<repository>::\n+\tThe \"remote\" repository that is destination of a push\n+\toperation.  This parameter can be either a URL\n+\t(see the section <<URLS,GIT URLS>> below) or the name\n+\tof a remote (see the section <<REMOTES,REMOTES>> below).\n+\n \n include::urls-remotes.txt[]\n \n-- \n1.7.2.3\n"}]}