{"thread":{"id":"29853","subject":"[PATCH] Documentation update for 'git branch'","startedAt":"2012-03-06T08:51:06Z","lastAt":"2012-03-06T19:43:41Z","messageCount":6,"participants":["vfr@lyx.org","Thomas Rast","Vincent van Ravesteijn","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"186182","messageId":"1331023866-5658-1-git-send-email-vfr@lyx.org","threadId":"29853","inReplyTo":null,"subject":"[PATCH] Documentation update for 'git branch'","fromName":"","fromEmail":"vfr@lyx.org","sentAt":"2012-03-06T08:51:06Z","receivedAt":"2012-03-06T08:51:06Z","isPatch":true,"sender":{"key":"vfr@lyx.org","avatar":"https://avatars.githubusercontent.com/u/687868?v=4"},"body":"From: Vincent van Ravesteijn \n\nChanges:\n- add a period to a sentence,\n- correct 'tag' into 'branch',\n- unify the use of backticks,\n- indicate that the commit parameter of --contains defaults to HEAD.\n\nSigned-off-by: Vincent van Ravesteijn \n---\n Documentation/git-branch.txt | 19 ++++++++++---------\n 1 files changed, 10 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt\nindex 0427e80..6410c3d 100644\n--- a/Documentation/git-branch.txt\n+++ b/Documentation/git-branch.txt\n@@ -24,8 +24,8 @@ be highlighted with an asterisk. Option `-r` causes the remote-tracking\n branches to be listed, and option `-a` shows both. This list mode is also\n activated by the `--list` option (see below).\n restricts the output to matching branches, the pattern is a shell\n-wildcard (i.e., matched using fnmatch(3))\n-Multiple patterns may be given; if any of them matches, the tag is shown.\n+wildcard (i.e., matched using fnmatch(3)).\n+Multiple patterns may be given; if any of them matches, the branch is shown.\n \n With `--contains`, shows only the branches that contain the named commit\n (in other words, the branches whose tip commits are descendants of the\n@@ -49,7 +49,7 @@ the remote-tracking branch. This behavior may be changed via the global\n overridden by using the `--track` and `--no-track` options, and\n changed later using `git branch --set-upstream`.\n \n-With a '-m' or '-M' option, will be renamed to .\n+With a `-m` or `-M` option, will be renamed to .\n If had a corresponding reflog, it is renamed to match\n , and a reflog entry is created to remember the branch\n renaming. If exists, -M must be used to force the rename\n@@ -59,7 +59,7 @@ With a `-d` or `-D` option, `` will be deleted. You may\n specify more than one branch for deletion. If the branch currently\n has a reflog then the reflog will also be deleted.\n \n-Use -r together with -d to delete remote-tracking branches. Note, that it\n+Use `-r` together with `-d` to delete remote-tracking branches. Note, that it\n only makes sense to delete remote-tracking branches if they no longer exist\n in the remote repository or if 'git fetch' was configured not to fetch\n them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a\n@@ -154,17 +154,18 @@ start-point is either a local or remote-tracking branch.\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+\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 --edit-description::\n \tOpen an editor and edit the text to explain what the branch is\n \tfor, to be used by various other commands (e.g. `request-pull`).\n \n---contains ::\n-\tOnly list branches which contain the specified commit.\n+--contains []::\n+\tOnly list branches which contain the specified commit (HEAD\n+\tif not specified).\n \n --merged []::\n \tOnly list branches whose tips are reachable from the\n-- \n1.7.5.4\n"},{"id":"186187","messageId":"871up66r45.fsf@thomas.inf.ethz.ch","threadId":"29853","inReplyTo":"1331023866-5658-1-git-send-email-vfr@lyx.org","subject":"Re: [PATCH] Documentation update for 'git branch'","fromName":"Thomas Rast","fromEmail":"trast@inf.ethz.ch","sentAt":"2012-03-06T09:00:42Z","receivedAt":"2012-03-06T09:00:42Z","isPatch":true,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Hi Vincent,\n\nvfr@lyx.org writes:\n\n> Changes:\n> - add a period to a sentence,\n> - correct 'tag' into 'branch',\n> - unify the use of backticks,\n> - indicate that the commit parameter of --contains defaults to HEAD.\n\nFirst off, please read Documentation/SubmittingPatches. I think this\nshould be split into at least two commits, one for the cleanups and one\nfor the actual change.\n\nAs for\n\n> - unify the use of backticks,\n\nnice catch, and note that this is a pretty common problem across the\ndocs.\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"},{"id":"186190","messageId":"1331026365-7044-1-git-send-email-user@vincent-VirtualBox","threadId":"29853","inReplyTo":"1331023866-5658-1-git-send-email-vfr@lyx.org","subject":"[PATCHv2 1/3] Documentation/git-branch: cleanups","fromName":"Vincent van Ravesteijn","fromEmail":"vfr@lyx.org","sentAt":"2012-03-06T09:32:43Z","receivedAt":"2012-03-06T09:32:43Z","isPatch":false,"sender":{"key":"vfr@lyx.org","avatar":"https://avatars.githubusercontent.com/u/687868?v=4"},"body":"From: Vincent van Ravesteijn \n\nChanges:\n- add a period to a sentence,\n- unify the use of backticks.\n\nSigned-off-by: Vincent van Ravesteijn \n---\n Documentation/git-branch.txt | 12 ++++++------\n 1 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt\nindex 0427e80..d3a923a 100644\n--- a/Documentation/git-branch.txt\n+++ b/Documentation/git-branch.txt\n@@ -24,7 +24,7 @@ be highlighted with an asterisk. Option `-r` causes the remote-tracking\n branches to be listed, and option `-a` shows both. This list mode is also\n activated by the `--list` option (see below).\n restricts the output to matching branches, the pattern is a shell\n-wildcard (i.e., matched using fnmatch(3))\n+wildcard (i.e., matched using fnmatch(3)).\n Multiple patterns may be given; if any of them matches, the tag is shown.\n \n With `--contains`, shows only the branches that contain the named commit\n@@ -49,7 +49,7 @@ the remote-tracking branch. This behavior may be changed via the global\n overridden by using the `--track` and `--no-track` options, and\n changed later using `git branch --set-upstream`.\n \n-With a '-m' or '-M' option, will be renamed to .\n+With a `-m` or `-M` option, will be renamed to .\n If had a corresponding reflog, it is renamed to match\n , and a reflog entry is created to remember the branch\n renaming. If exists, -M must be used to force the rename\n@@ -59,7 +59,7 @@ With a `-d` or `-D` option, `` will be deleted. You may\n specify more than one branch for deletion. If the branch currently\n has a reflog then the reflog will also be deleted.\n \n-Use -r together with -d to delete remote-tracking branches. Note, that it\n+Use `-r` together with `-d` to delete remote-tracking branches. Note, that it\n only makes sense to delete remote-tracking branches if they no longer exist\n in the remote repository or if 'git fetch' was configured not to fetch\n them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a\n@@ -154,9 +154,9 @@ start-point is either a local or remote-tracking branch.\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+\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 --edit-description::\n-- \n1.7.5.4\n"},{"id":"186192","messageId":"1331026365-7044-2-git-send-email-user@vincent-VirtualBox","threadId":"29853","inReplyTo":"1331026365-7044-1-git-send-email-user@vincent-VirtualBox","subject":"[PATCHv2 2/3] Documentation/git-branch: fix a typo","fromName":"Vincent van Ravesteijn","fromEmail":"vfr@lyx.org","sentAt":"2012-03-06T09:32:44Z","receivedAt":"2012-03-06T09:32:44Z","isPatch":false,"sender":{"key":"vfr@lyx.org","avatar":"https://avatars.githubusercontent.com/u/687868?v=4"},"body":"From: Vincent van Ravesteijn \n\nFix a typo by replacing 'tag' with 'branch'.\n\nSigned-off-by: Vincent van Ravesteijn \n---\n Documentation/git-branch.txt | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt\nindex d3a923a..cfceac5 100644\n--- a/Documentation/git-branch.txt\n+++ b/Documentation/git-branch.txt\n@@ -25,7 +25,7 @@ branches to be listed, and option `-a` shows both. This list mode is also\n activated by the `--list` option (see below).\n restricts the output to matching branches, the pattern is a shell\n wildcard (i.e., matched using fnmatch(3)).\n-Multiple patterns may be given; if any of them matches, the tag is shown.\n+Multiple patterns may be given; if any of them matches, the branch is shown.\n \n With `--contains`, shows only the branches that contain the named commit\n (in other words, the branches whose tip commits are descendants of the\n-- \n1.7.5.4\n"},{"id":"186191","messageId":"1331026365-7044-3-git-send-email-user@vincent-VirtualBox","threadId":"29853","inReplyTo":"1331026365-7044-1-git-send-email-user@vincent-VirtualBox","subject":"[PATCHv2 3/3] Documentation/git-branch: add default for --contains","fromName":"Vincent van Ravesteijn","fromEmail":"vfr@lyx.org","sentAt":"2012-03-06T09:32:45Z","receivedAt":"2012-03-06T09:32:45Z","isPatch":false,"sender":{"key":"vfr@lyx.org","avatar":"https://avatars.githubusercontent.com/u/687868?v=4"},"body":"From: Vincent van Ravesteijn \n\nIndicate that the commit parameter of --contains defaults to HEAD.\n\nSigned-off-by: Vincent van Ravesteijn \n---\n Documentation/git-branch.txt | 5 +++--\n 1 files changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt\nindex cfceac5..6410c3d 100644\n--- a/Documentation/git-branch.txt\n+++ b/Documentation/git-branch.txt\n@@ -163,8 +163,9 @@ start-point is either a local or remote-tracking branch.\n \tOpen an editor and edit the text to explain what the branch is\n \tfor, to be used by various other commands (e.g. `request-pull`).\n \n---contains ::\n-\tOnly list branches which contain the specified commit.\n+--contains []::\n+\tOnly list branches which contain the specified commit (HEAD\n+\tif not specified).\n \n --merged []::\n \tOnly list branches whose tips are reachable from the\n-- \n1.7.5.4\n"},{"id":"186243","messageId":"7vobs9sefm.fsf@alter.siamese.dyndns.org","threadId":"29853","inReplyTo":"1331026365-7044-1-git-send-email-user@vincent-VirtualBox","subject":"Re: [PATCHv2 1/3] Documentation/git-branch: cleanups","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-03-06T19:43:41Z","receivedAt":"2012-03-06T19:43:41Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks, both.\nWill queue.\n"}]}