From 4208a203e6137b4bfab725af022ba50ccd2c5e73 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 25 Oct 2007 06:50:35 +0000 Subject: [PATCH] Autogenerated manpages for v1.5.3.4-383-gd90a --- man1/git-config.1 | 4 ++-- man1/git-http-push.1 | 7 +++++-- man1/git-send-email.1 | 5 ++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/man1/git-config.1 b/man1/git-config.1 index d58d6123f..f420503d8 100644 --- a/man1/git-config.1 +++ b/man1/git-config.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-CONFIG" "1" "10/23/2007" "Git 1.5.3.4.319.gdd817" "Git Manual" +.TH "GIT\-CONFIG" "1" "10/25/2007" "Git 1.5.3.4.383.gd90a" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -426,7 +426,7 @@ branch..remote When in branch , it tells git fetch which remote to fetch. If this option is not given, git fetch defaults to remote "origin". .TP branch..merge -When in branch , it tells git fetch the default refspec to be marked for merging in FETCH_HEAD. The value has exactly to match a remote part of one of the refspecs which are fetched from the remote given by "branch..remote". The merge information is used by git pull (which at first calls git fetch) to lookup the default branch for merging. Without this option, git pull defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. If you wish to setup git pull so that it merges into from another branch in the local repository, you can point branch..merge to the desired branch, and use the special setting . (a period) for branch..remote. +When in branch , it tells git fetch the default refspec to be marked for merging in FETCH_HEAD. The value is handled like the remote part of a refspec, and must match a ref which is fetched from the remote given by "branch..remote". The merge information is used by git pull (which at first calls git fetch) to lookup the default branch for merging. Without this option, git pull defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. If you wish to setup git pull so that it merges into from another branch in the local repository, you can point branch..merge to the desired branch, and use the special setting . (a period) for branch..remote. .TP branch..mergeoptions Sets default options for merging into branch . The syntax and supported options are equal to that of \fBgit\-merge\fR(1), but option values containing whitespace characters are currently not supported. diff --git a/man1/git-http-push.1 b/man1/git-http-push.1 index e265258c9..a749e2bcc 100644 --- a/man1/git-http-push.1 +++ b/man1/git-http-push.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-HTTP\-PUSH" "1" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual" +.TH "GIT\-HTTP\-PUSH" "1" "10/25/2007" "Git 1.5.3.4.383.gd90a" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -10,7 +10,7 @@ .SH "NAME" git\-http\-push \- Push objects over HTTP/DAV to another repository .SH "SYNOPSIS" -\fIgit\-http\-push\fR [\-\-all] [\-\-force] [\-\-verbose] [\&...] +\fIgit\-http\-push\fR [\-\-all] [\-\-dry\-run] [\-\-force] [\-\-verbose] [\&...] .SH "DESCRIPTION" Sends missing objects to remote repository, and updates the remote branch. .SH "OPTIONS" @@ -21,6 +21,9 @@ Do not assume that the remote repository is complete in its current state, and v \-\-force Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. This flag disables the check. What this means is that the remote repository can lose commits; use it with care. .TP +\-\-dry\-run +Do everything except actually send the updates. +.TP \-\-verbose Report the list of objects being walked locally and the list of objects successfully sent to the remote repository. .TP diff --git a/man1/git-send-email.1 b/man1/git-send-email.1 index 480e49a9e..cbab75bd8 100644 --- a/man1/git-send-email.1 +++ b/man1/git-send-email.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-SEND\-EMAIL" "1" "09/30/2007" "Git 1.5.3.3.114.g2a85" "Git Manual" +.TH "GIT\-SEND\-EMAIL" "1" "10/25/2007" "Git 1.5.3.4.383.gd90a" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -94,6 +94,9 @@ To avoid typing long email addresses, point this to one or more email aliases fi sendemail.aliasfiletype Format of the file(s) specified in sendemail.aliasesfile. Must be one of \fImutt\fR, \fImailrc\fR, \fIpine\fR, or \fIgnus\fR. .TP +sendemail.to +Email address (or alias) to always send to. +.TP sendemail.cccmd Command to execute to generate per patch file specific "Cc:"s. .TP -- 2.26.2