summaryrefslogtreecommitdiffstats
path: root/git-branch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-09-17 13:26:22 -0700
committerJunio C Hamano <gitster@pobox.com>2015-09-17 13:26:22 -0700
commit7db630e9ad300e03ab260342c41c36ed83ecdd7a (patch)
tree78e59560240f3901ff5f5fd41dd6578c654e4972 /git-branch.txt
parent32af746de6ad79c9da1e27d09695a9bec7fa4df3 (diff)
downloadgit-htmldocs-7db630e9ad300e03ab260342c41c36ed83ecdd7a.tar.gz
Autogenerated HTML docs for v2.6.0-rc2-23-g0e57
Diffstat (limited to 'git-branch.txt')
-rw-r--r--git-branch.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-branch.txt b/git-branch.txt
index a67138a02..bbbade4f5 100644
--- a/git-branch.txt
+++ b/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