mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  git fetch documentation: describe short '-p' synonym to '--prune' option
  format-patch: document the format.to configuration setting
This commit is contained in:
Junio C Hamano
2010-07-13 09:14:35 -07:00
parent 637ab29b86 1b79d1c2a8
commit 449aeb10d5
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/config.txt
View File

@ -886,9 +886,11 @@ format.headers::
Additional email headers to include in a patch to be submitted Additional email headers to include in a patch to be submitted
by mail. See linkgit:git-format-patch[1]. by mail. See linkgit:git-format-patch[1].
format.to::
format.cc:: format.cc::
Additional "Cc:" headers to include in a patch to be submitted Additional recipients to include in a patch to be submitted
by mail. See the --cc option in linkgit:git-format-patch[1]. by mail. See the --to and --cc options in
linkgit:git-format-patch[1].
format.subjectprefix:: format.subjectprefix::
The default for format-patch is to output files with the '[PATCH]' The default for format-patch is to output files with the '[PATCH]'

1
Documentation/fetch-options.txt
View File

@ -34,6 +34,7 @@ ifndef::git-pull[]
Allow several <repository> and <group> arguments to be Allow several <repository> and <group> arguments to be
specified. No <refspec>s may be specified. specified. No <refspec>s may be specified.
-p::
--prune:: --prune::
After fetching, remove any remote tracking branches which After fetching, remove any remote tracking branches which
no longer exist on the remote. no longer exist on the remote.