diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-13 16:14:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-13 16:14:35 (GMT) |
| commit | 449aeb10d5d28083199f82c444b55a03c545e956 (patch) | |
| tree | 76f491a8574e9a199a47ba3975fd181a4ace677a | |
| parent | 637ab29b86533c7ce65a615fd445d163a2c57dc9 (diff) | |
| parent | 1b79d1c2a8a90419238f7213870ab1dc465082fe (diff) | |
| download | git-449aeb10d5d28083199f82c444b55a03c545e956.zip git-449aeb10d5d28083199f82c444b55a03c545e956.tar.gz git-449aeb10d5d28083199f82c444b55a03c545e956.tar.bz2 | |
Merge branch 'maint'
* maint:
git fetch documentation: describe short '-p' synonym to '--prune' option
format-patch: document the format.to configuration setting
| -rw-r--r-- | Documentation/config.txt | 6 | ||||
| -rw-r--r-- | Documentation/fetch-options.txt | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 72949e7..79d54e5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -886,9 +886,11 @@ format.headers:: Additional email headers to include in a patch to be submitted by mail. See linkgit:git-format-patch[1]. +format.to:: format.cc:: - Additional "Cc:" headers to include in a patch to be submitted - by mail. See the --cc option in linkgit:git-format-patch[1]. + Additional recipients to include in a patch to be submitted + by mail. See the --to and --cc options in + linkgit:git-format-patch[1]. format.subjectprefix:: The default for format-patch is to output files with the '[PATCH]' diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 044ec88..9333c42 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -34,6 +34,7 @@ ifndef::git-pull[] Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified. +-p:: --prune:: After fetching, remove any remote tracking branches which no longer exist on the remote. |