summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-19 20:22:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-19 20:22:21 (GMT)
commit566fdaf611f44724120412a43132c07b020fc4f1 (patch)
tree4b8d056b29834761c79fd250a5c38ab3bfd1ab0d /Documentation/config.txt
parent39cadeec0db35a79a2713eceaf998f2745236f0c (diff)
parentbc437d10202c015a5733f706dc44fa6bbf4d85b9 (diff)
downloadgit-566fdaf611f44724120412a43132c07b020fc4f1.zip
git-566fdaf611f44724120412a43132c07b020fc4f1.tar.gz
git-566fdaf611f44724120412a43132c07b020fc4f1.tar.bz2
Merge branch 'nd/fetch-ref-summary'
Improve the look of the way "git fetch" reports what happened to each ref that was fetched. * nd/fetch-ref-summary: fetch: reduce duplicate in ref update status lines with placeholder fetch: align all "remote -> local" output fetch: change flag code for displaying tag update and deleted ref fetch: refactor ref update status formatting code git-fetch.txt: document fetch output
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 226c12a..e455fae 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1243,6 +1243,11 @@ fetch.prune::
If true, fetch will automatically behave as if the `--prune`
option was given on the command line. See also `remote.<name>.prune`.
+fetch.output::
+ Control how ref update status is printed. Valid values are
+ `full` and `compact`. Default value is `full`. See section
+ OUTPUT in linkgit:git-fetch[1] for detail.
+
format.attach::
Enable multipart/mixed attachments as the default for
'format-patch'. The value can also be a double quoted string