summaryrefslogtreecommitdiff
path: root/Documentation/git-branch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-09-17 12:29:03 -0700
committerJunio C Hamano <gitster@pobox.com>2015-09-17 12:29:03 -0700
commita2654356d4ef9ffac4adda2b053d45def8e0a45c (patch)
tree6ff033bb7dea1c5afa9db2bddf153920fe6d01fd /Documentation/git-branch.txt
parent8d45eefe3ee6bf8499221761df1ee80ead2c8fc0 (diff)
parent561d2b7934caaa5e0917979da82ca59b17a4e5f9 (diff)
downloadgit-a2654356d4ef9ffac4adda2b053d45def8e0a45c.tar.gz
Merge branch 'po/doc-branch-desc'
The branch descriptions that are set with "git branch --edit-description" option were used in many places but they weren't clearly documented. * po/doc-branch-desc: doc: show usage of branch description
Diffstat (limited to 'Documentation/git-branch.txt')
-rw-r--r--Documentation/git-branch.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index a67138a022..bbbade4f51 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -197,7 +197,9 @@ start-point is either a local or remote-tracking branch.
--edit-description::
Open an editor and edit the text to explain what the branch is
- for, to be used by various other commands (e.g. `request-pull`).
+ for, to be used by various other commands (e.g. `format-patch`,
+ `request-pull`, and `merge` (if enabled)). Multi-line explanations
+ may be used.
--contains [<commit>]::
Only list branches which contain the specified commit (HEAD