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
This commit is contained in:
commit
a2654356d4
@ -197,7 +197,9 @@ start-point is either a local or remote-tracking branch.
|
|||||||
|
|
||||||
--edit-description::
|
--edit-description::
|
||||||
Open an editor and edit the text to explain what the branch is
|
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>]::
|
--contains [<commit>]::
|
||||||
Only list branches which contain the specified commit (HEAD
|
Only list branches which contain the specified commit (HEAD
|
||||||
|
@ -213,7 +213,7 @@ feeding the result to `git send-email`.
|
|||||||
|
|
||||||
--[no-]cover-letter::
|
--[no-]cover-letter::
|
||||||
In addition to the patches, generate a cover letter file
|
In addition to the patches, generate a cover letter file
|
||||||
containing the shortlog and the overall diffstat. You can
|
containing the branch description, shortlog and the overall diffstat. You can
|
||||||
fill in a description in the file before sending it out.
|
fill in a description in the file before sending it out.
|
||||||
|
|
||||||
--notes[=<ref>]::
|
--notes[=<ref>]::
|
||||||
|
@ -78,7 +78,7 @@ will be appended to the specified message.
|
|||||||
+
|
+
|
||||||
The 'git fmt-merge-msg' command can be
|
The 'git fmt-merge-msg' command can be
|
||||||
used to give a good default for automated 'git merge'
|
used to give a good default for automated 'git merge'
|
||||||
invocations.
|
invocations. The automated message can include the branch description.
|
||||||
|
|
||||||
--[no-]rerere-autoupdate::
|
--[no-]rerere-autoupdate::
|
||||||
Allow the rerere mechanism to update the index with the
|
Allow the rerere mechanism to update the index with the
|
||||||
|
@ -14,7 +14,8 @@ DESCRIPTION
|
|||||||
-----------
|
-----------
|
||||||
|
|
||||||
Generate a request asking your upstream project to pull changes into
|
Generate a request asking your upstream project to pull changes into
|
||||||
their tree. The request, printed to the standard output, summarizes
|
their tree. The request, printed to the standard output,
|
||||||
|
begins with the branch description, summarizes
|
||||||
the changes and indicates from where they can be pulled.
|
the changes and indicates from where they can be pulled.
|
||||||
|
|
||||||
The upstream project is expected to have the commit named by
|
The upstream project is expected to have the commit named by
|
||||||
|
Loading…
Reference in New Issue
Block a user