{"thread":{"id":"3988","subject":"[PATCH] Update the git-branch man page to include the \"-r\" option,","startedAt":"2006-04-28T13:15:04Z","lastAt":"2006-04-28T13:15:04Z","messageCount":1,"participants":["Sean Estabrooks"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"19226","messageId":"BAYC1-PASMTP12A9682774BA94F33C4BBDAEB20@CEZ.ICE","threadId":"3988","inReplyTo":"11462301062278-git-send-email-seanlkml@sympatico.ca","subject":"[PATCH] Update the git-branch man page to include the \"-r\" option,","fromName":"Sean Estabrooks","fromEmail":"seanlkml@sympatico.ca","sentAt":"2006-04-28T13:15:04Z","receivedAt":"2006-04-28T13:15:04Z","isPatch":true,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"and fix up asciidoc \"callouts\"\n\nSigned-off-by: Sean Estabrooks <seanlkml@sympatico.ca>\n\n\n---\n\n Documentation/git-branch.txt |   57 +++++++++++++++++++++++++++++-------------\n 1 files changed, 39 insertions(+), 18 deletions(-)\n\n5f70eb7e8c318528885cdd9b35bfa1d92cbf6782\ndiff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt\nindex 71ecd85..050e1f7 100644\n--- a/Documentation/git-branch.txt\n+++ b/Documentation/git-branch.txt\n@@ -3,22 +3,27 @@ git-branch(1)\n \n NAME\n ----\n-git-branch - Create a new branch, or remove an old one\n+git-branch - List, create, or delete branches.\n \n SYNOPSIS\n --------\n [verse]\n-'git-branch' [[-f] <branchname> [<start-point>]]\n-'git-branch' (-d | -D) <branchname>\n+'git-branch' [-r]\n+'git-branch' [-f] <branchname> [<start-point>]\n+'git-branch' (-d | -D) <branchname>...\n \n DESCRIPTION\n -----------\n-If no argument is provided, show available branches and mark current\n-branch with star. Otherwise, create a new branch of name <branchname>.\n-If a starting point is also specified, that will be where the branch is\n-created, otherwise it will be created at the current HEAD.\n+With no arguments given (or just `-r`) a list of available branches\n+will be shown, the current branch will be highlighted with an asterisk.\n \n-With a `-d` or `-D` option, `<branchname>` will be deleted.\n+In its second form, a new branch named <branchname> will be created.\n+It will start out with a head equal to the one given as <start-point>.\n+If no <start-point> is given, the branch will be created with a head\n+equal to that of the currently checked out branch.\n+\n+With a `-d` or `-D` option, `<branchname>` will be deleted.  You may\n+specify more than one branch for deletion.\n \n \n OPTIONS\n@@ -30,40 +35,56 @@ OPTIONS\n \tDelete a branch irrespective of its index status.\n \n -f::\n-\tForce a reset of <branchname> to <start-point> (or current head).\n+\tForce the creation of a new branch even if it means deleting\n+\ta branch that already exists with the same name.\n+\n+-r::\n+\tList only the \"remote\" branches.\n \n <branchname>::\n \tThe name of the branch to create or delete.\n \n <start-point>::\n-\tWhere to create the branch; defaults to HEAD. This\n-\toption has no meaning with -d and -D.\n+\tThe new branch will be created with a HEAD equal to this.  It may\n+\tbe given as a branch name, a commit-id, or a tag.  If this option \n+\tis omitted, the current branch is assumed.\n+\n \n \n Examples\n-~~~~~~~~\n+--------\n \n Start development off of a known tag::\n +\n ------------\n $ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n $ cd my2.6\n-$ git branch my2.6.14 v2.6.14 <1>\n+$ git branch my2.6.14 v2.6.14   <1>\n $ git checkout my2.6.14\n-\n-<1> These two steps are the same as \"checkout -b my2.6.14 v2.6.14\".\n ------------\n++\n+<1> This step and the next one could be combined into a single step with \n+\"checkout -b my2.6.14 v2.6.14\".\n \n Delete unneeded branch::\n +\n ------------\n $ git clone git://git.kernel.org/.../git.git my.git\n $ cd my.git\n-$ git branch -D todo <1>\n-\n+$ git branch -D todo    <1>\n+------------\n++\n <1> delete todo branch even if the \"master\" branch does not have all\n commits from todo branch.\n-------------\n+\n+\n+Notes\n+-----\n+\n+If you are creating a branch that you want to immediately checkout, it's \n+easier to use the git checkout command with its `-b` option to create\n+a branch and check it out with a single command.\n+\n \n Author\n ------\n-- \n1.3.1.gc672\n"}]}