diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-09 08:27:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-09 08:27:09 -0800 |
| commit | 3a2ce799811c7df98a1b0cd3541f68227e587483 (patch) | |
| tree | e60572cdbd98de8a4b859fab44679c8d1b84e185 /Documentation | |
| parent | 7f27ac56a549fff45e85dae48cec713a340b0616 (diff) | |
| parent | 5ee29aefac94d4ed11fc5101c89697f39057abb5 (diff) | |
| download | git-3a2ce799811c7df98a1b0cd3541f68227e587483.tar.gz | |
Merge branch 'nd/maint-branch-desc-doc'
Teach various forms of "format-patch" command line to identify what
branch the patches are taken from, so that the branch description
is picked up in more cases.
* nd/maint-branch-desc-doc:
format-patch: pick up branch description when no ref is specified
format-patch: pick up correct branch name from symbolic ref
t4014: a few more tests on cover letter using branch description
branch: delete branch description if it's empty
config.txt: a few lines about branch.<name>.description
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 53c4ca1d7a..d5809e0e8c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -739,6 +739,12 @@ branch.<name>.rebase:: it unless you understand the implications (see linkgit:git-rebase[1] for details). +branch.<name>.description:: + Branch description, can be edited with + `git branch --edit-description`. Branch description is + automatically added in the format-patch cover letter or + request-pull summary. + browser.<tool>.cmd:: Specify the command to invoke the specified browser. The specified command is evaluated in shell with the URLs passed |