Skip to content

Commit a265435

Browse files
committed
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
2 parents 8d45eef + 561d2b7 commit a265435

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

Documentation/git-branch.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,9 @@ start-point is either a local or remote-tracking branch.
197197

198198
--edit-description::
199199
Open an editor and edit the text to explain what the branch is
200-
for, to be used by various other commands (e.g. `request-pull`).
200+
for, to be used by various other commands (e.g. `format-patch`,
201+
`request-pull`, and `merge` (if enabled)). Multi-line explanations
202+
may be used.
201203

202204
--contains [<commit>]::
203205
Only list branches which contain the specified commit (HEAD

Documentation/git-format-patch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ feeding the result to `git send-email`.
213213

214214
--[no-]cover-letter::
215215
In addition to the patches, generate a cover letter file
216-
containing the shortlog and the overall diffstat. You can
216+
containing the branch description, shortlog and the overall diffstat. You can
217217
fill in a description in the file before sending it out.
218218

219219
--notes[=<ref>]::

Documentation/git-merge.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ will be appended to the specified message.
7878
+
7979
The 'git fmt-merge-msg' command can be
8080
used to give a good default for automated 'git merge'
81-
invocations.
81+
invocations. The automated message can include the branch description.
8282

8383
--[no-]rerere-autoupdate::
8484
Allow the rerere mechanism to update the index with the

Documentation/git-request-pull.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ DESCRIPTION
1414
-----------
1515

1616
Generate a request asking your upstream project to pull changes into
17-
their tree. The request, printed to the standard output, summarizes
17+
their tree. The request, printed to the standard output,
18+
begins with the branch description, summarizes
1819
the changes and indicates from where they can be pulled.
1920

2021
The upstream project is expected to have the commit named by

0 commit comments

Comments
 (0)