From c2b47097e74c7f2df225d9cd7e68724923d0e3c5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 25 Oct 2007 06:50:31 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3.4-383-gd90a --- config.txt | 9 +++++---- git-config.html | 11 ++++++----- git-http-push.html | 12 ++++++++++-- git-http-push.txt | 5 ++++- git-send-email.html | 10 +++++++++- git-send-email.txt | 3 +++ 6 files changed, 37 insertions(+), 13 deletions(-) diff --git a/config.txt b/config.txt index d4a476e2f..edf50cd21 100644 --- a/config.txt +++ b/config.txt @@ -324,10 +324,11 @@ branch..remote:: If this option is not given, `git fetch` defaults to remote "origin". 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". + 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. diff --git a/git-config.html b/git-config.html index f9d424012..b57444bf1 100644 --- a/git-config.html +++ b/git-config.html @@ -1101,10 +1101,11 @@ branch.<name>.merge

- When in branch <name>, 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.<name>.remote". + When in branch <name>, 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.<name>.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. @@ -1941,7 +1942,7 @@ transfer.unpackLimit

diff --git a/git-http-push.html b/git-http-push.html index 62377e330..0b9e86393 100644 --- a/git-http-push.html +++ b/git-http-push.html @@ -272,7 +272,7 @@ git-http-push(1) Manual Page

SYNOPSIS

-

git-http-push [--all] [--force] [--verbose] <url> <ref> [<ref>…]

+

git-http-push [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>…]

DESCRIPTION

@@ -305,6 +305,14 @@ remote branch.

+--dry-run +
+
+

+ Do everything except actually send the updates. +

+
+
--verbose
@@ -412,7 +420,7 @@ to disable the fast-forward check only on that ref.

diff --git a/git-http-push.txt b/git-http-push.txt index 9afb86038..3a69b719b 100644 --- a/git-http-push.txt +++ b/git-http-push.txt @@ -8,7 +8,7 @@ git-http-push - Push objects over HTTP/DAV to another repository SYNOPSIS -------- -'git-http-push' [--all] [--force] [--verbose] [...] +'git-http-push' [--all] [--dry-run] [--force] [--verbose] [...] DESCRIPTION ----------- @@ -30,6 +30,9 @@ OPTIONS the remote repository can lose commits; use it with care. +--dry-run:: + Do everything except actually send the updates. + --verbose:: Report the list of objects being walked locally and the list of objects successfully sent to the remote repository. diff --git a/git-send-email.html b/git-send-email.html index 45cfbcab1..7f70bdb4f 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -535,6 +535,14 @@ sendemail.aliasfiletype

+sendemail.to +
+
+

+ Email address (or alias) to always send to. +

+
+
sendemail.cccmd
@@ -609,7 +617,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

diff --git a/git-send-email.txt b/git-send-email.txt index 3727776a0..e38b7021b 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -159,6 +159,9 @@ sendemail.aliasfiletype:: Format of the file(s) specified in sendemail.aliasesfile. Must be one of 'mutt', 'mailrc', 'pine', or 'gnus'. +sendemail.to:: + Email address (or alias) to always send to. + sendemail.cccmd:: Command to execute to generate per patch file specific "Cc:"s. -- 2.26.2