{"thread":{"id":"25891","subject":"[PATCH] git-checkout.txt: order options alphabetically","startedAt":"2010-12-01T18:05:33Z","lastAt":"2010-12-01T18:05:33Z","messageCount":1,"participants":["jari.aalto@cante.net"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"156971","messageId":"1291226733-17562-1-git-send-email-jari.aalto@cante.net","threadId":"25891","inReplyTo":null,"subject":"[PATCH] git-checkout.txt: order options alphabetically","fromName":"","fromEmail":"jari.aalto@cante.net","sentAt":"2010-12-01T18:05:33Z","receivedAt":"2010-12-01T18:05:33Z","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-checkout.txt |  121 ++++++++++++++++++++--------------------\n 1 files changed, 60 insertions(+), 61 deletions(-)\n\ndiff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt\nindex 880763d..5e7c870 100644\n--- a/Documentation/git-checkout.txt\n+++ b/Documentation/git-checkout.txt\n@@ -64,23 +64,6 @@ file can be discarded to re-create the original conflicted merge result.\n \n OPTIONS\n -------\n--q::\n---quiet::\n-\tQuiet, suppress feedback messages.\n-\n--f::\n---force::\n-\tWhen switching branches, proceed even if the index or the\n-\tworking tree differs from HEAD.  This is used to throw away\n-\tlocal changes.\n-+\n-When checking out paths from the index, do not fail upon unmerged\n-entries; instead, unmerged entries are ignored.\n-\n---ours::\n---theirs::\n-\tWhen checking out paths from the index, check out stage #2\n-\t('ours') or #3 ('theirs') for unmerged paths.\n \n -b::\n \tCreate a new branch named <new_branch> and start it at\n@@ -92,28 +75,53 @@ entries; instead, unmerged entries are ignored.\n \tequivalent to running \"git branch\" with \"-f\"; see\n \tlinkgit:git-branch[1] for details.\n \n--t::\n---track::\n-\tWhen creating a new branch, set up \"upstream\" configuration. See\n-\t\"--track\" in linkgit:git-branch[1] for details.\n+--conflict=<style>::\n+\tThe same as --merge option above, but changes the way the\n+\tconflicting hunks are presented, overriding the\n+\tmerge.conflictstyle configuration variable.  Possible values are\n+\t\"merge\" (default) and \"diff3\" (in addition to what is shown by\n+\t\"merge\" style, shows the original contents).\n+\n+-f::\n+--force::\n+\tWhen switching branches, proceed even if the index or the\n+\tworking tree differs from HEAD.  This is used to throw away\n+\tlocal changes.\n +\n-If no '-b' option is given, the name of the new branch will be\n-derived from the remote-tracking branch.  If \"remotes/\" or \"refs/remotes/\"\n-is prefixed it is stripped away, and then the part up to the\n-next slash (which would be the nickname of the remote) is removed.\n-This would tell us to use \"hack\" as the local branch when branching\n-off of \"origin/hack\" (or \"remotes/origin/hack\", or even\n-\"refs/remotes/origin/hack\").  If the given name has no slash, or the above\n-guessing results in an empty name, the guessing is aborted.  You can\n-explicitly give a name with '-b' in such a case.\n+When checking out paths from the index, do not fail upon unmerged\n+entries; instead, unmerged entries are ignored.\n+\n+-l::\n+\tCreate the new branch's reflog; see linkgit:git-branch[1] for\n+\tdetails.\n+\n+-m::\n+--merge::\n+\tWhen switching branches,\n+\tif you have local modifications to one or more files that\n+\tare different between the current branch and the branch to\n+\twhich you are switching, the command refuses to switch\n+\tbranches in order to preserve your modifications in context.\n+\tHowever, with this option, a three-way merge between the current\n+\tbranch, your working tree contents, and the new branch\n+\tis done, and you will be on the new branch.\n++\n+When a merge conflict happens, the index entries for conflicting\n+paths are left unmerged, and you need to resolve the conflicts\n+and mark the resolved paths with `git add` (or `git rm` if the merge\n+should result in deletion of the path).\n++\n+When checking out paths from the index, this option lets you recreate\n+the conflicted merge in the specified paths.\n \n --no-track::\n \tDo not set up \"upstream\" configuration, even if the\n \tbranch.autosetupmerge configuration variable is true.\n \n--l::\n-\tCreate the new branch's reflog; see linkgit:git-branch[1] for\n-\tdetails.\n+--ours::\n+--theirs::\n+\tWhen checking out paths from the index, check out stage #2\n+\t('ours') or #3 ('theirs') for unmerged paths.\n \n --orphan::\n \tCreate a new 'orphan' branch, named <new_branch>, started from\n@@ -140,32 +148,6 @@ branch by running \"git rm -rf .\" from the top level of the working tree.\n Afterwards you will be ready to prepare your new files, repopulating the\n working tree, by copying them from elsewhere, extracting a tarball, etc.\n \n--m::\n---merge::\n-\tWhen switching branches,\n-\tif you have local modifications to one or more files that\n-\tare different between the current branch and the branch to\n-\twhich you are switching, the command refuses to switch\n-\tbranches in order to preserve your modifications in context.\n-\tHowever, with this option, a three-way merge between the current\n-\tbranch, your working tree contents, and the new branch\n-\tis done, and you will be on the new branch.\n-+\n-When a merge conflict happens, the index entries for conflicting\n-paths are left unmerged, and you need to resolve the conflicts\n-and mark the resolved paths with `git add` (or `git rm` if the merge\n-should result in deletion of the path).\n-+\n-When checking out paths from the index, this option lets you recreate\n-the conflicted merge in the specified paths.\n-\n---conflict=<style>::\n-\tThe same as --merge option above, but changes the way the\n-\tconflicting hunks are presented, overriding the\n-\tmerge.conflictstyle configuration variable.  Possible values are\n-\t\"merge\" (default) and \"diff3\" (in addition to what is shown by\n-\t\"merge\" style, shows the original contents).\n-\n -p::\n --patch::\n \tInteractively select hunks in the difference between the\n@@ -176,6 +158,25 @@ the conflicted merge in the specified paths.\n This means that you can use `git checkout -p` to selectively discard\n edits from your current working tree.\n \n+-q::\n+--quiet::\n+\tQuiet, suppress feedback messages.\n+\n+-t::\n+--track::\n+\tWhen creating a new branch, set up \"upstream\" configuration. See\n+\t\"--track\" in linkgit:git-branch[1] for details.\n++\n+If no '-b' option is given, the name of the new branch will be\n+derived from the remote-tracking branch.  If \"remotes/\" or \"refs/remotes/\"\n+is prefixed it is stripped away, and then the part up to the\n+next slash (which would be the nickname of the remote) is removed.\n+This would tell us to use \"hack\" as the local branch when branching\n+off of \"origin/hack\" (or \"remotes/origin/hack\", or even\n+\"refs/remotes/origin/hack\").  If the given name has no slash, or the above\n+guessing results in an empty name, the guessing is aborted.  You can\n+explicitly give a name with '-b' in such a case.\n+\n <branch>::\n \tBranch to checkout; if it refers to a branch (i.e., a name that,\n \twhen prepended with \"refs/heads/\", is a valid ref), then that\n@@ -202,8 +203,6 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.\n \tTree to checkout from (when paths are given). If not specified,\n \tthe index will be used.\n \n-\n-\n Detached HEAD\n -------------\n \n-- \n1.7.2.3\n"}]}