From: Junio C Hamano Date: Tue, 12 Feb 2008 03:18:52 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.4.1-97-g40aab X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9c33415fc305e37bd5a1f399bae1c3b9e2559571;p=git.git Autogenerated HTML docs for v1.5.4.1-97-g40aab --- diff --git a/config.txt b/config.txt index 3e10feb9f..f9bdb164e 100644 --- a/config.txt +++ b/config.txt @@ -333,7 +333,7 @@ branch.autosetupmerge:: so that linkgit:git-pull[1] will appropriately merge from that remote branch. Note that even if this option is not set, this behavior can be chosen per-branch using the `--track` - and `--no-track` options. This option defaults to false. + and `--no-track` options. This option defaults to true. branch..remote:: When in branch , it tells `git fetch` which remote to fetch. diff --git a/git-branch.html b/git-branch.html index d8d405cfd..227436d9c 100644 --- a/git-branch.html +++ b/git-branch.html @@ -296,11 +296,11 @@ equal to that of the currently checked out branch.

Note that this will create the new branch, but it will not switch the working tree to it; use "git checkout <newbranch>" to switch to the new branch.

-

When a local branch is started off a remote branch, git can setup the +

When a local branch is started off a remote branch, git sets up the branch so that git-pull(1) will appropriately merge from that -remote branch. If this behavior is desired, it is possible to make it -the default using the global branch.autosetupmerge configuration -flag. Otherwise, it can be chosen per-branch using the --track +remote branch. If this behavior is not desired, it is possible to +disable it using the global branch.autosetupmerge configuration +flag. That setting can be overridden by using the --track and --no-track options.

With a -m or -M option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match @@ -436,10 +436,11 @@ clean up all obsolete remote-tracking branches.

Set up configuration so that git-pull will automatically retrieve data from the remote branch. Use this if you always pull from the same remote branch into the new branch, or if you - don't want to use "git pull <repository> <refspec>" explicitly. Set the - branch.autosetupmerge configuration variable to true if you + don't want to use "git pull <repository> <refspec>" explicitly. + This behavior is the default. Set the + branch.autosetupmerge configuration variable to false if you want git-checkout and git-branch to always behave as if - --track were given. + --no-track were given.

@@ -565,7 +566,7 @@ a branch and check it out with a single command.

diff --git a/git-branch.txt b/git-branch.txt index f920c04cc..7e8874aca 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -34,11 +34,11 @@ Note that this will create the new branch, but it will not switch the working tree to it; use "git checkout " to switch to the new branch. -When a local branch is started off a remote branch, git can setup the +When a local branch is started off a remote branch, git sets up the branch so that linkgit:git-pull[1] will appropriately merge from that -remote branch. If this behavior is desired, it is possible to make it -the default using the global `branch.autosetupmerge` configuration -flag. Otherwise, it can be chosen per-branch using the `--track` +remote branch. If this behavior is not desired, it is possible to +disable it using the global `branch.autosetupmerge` configuration +flag. That setting can be overridden by using the `--track` and `--no-track` options. With a '-m' or '-M' option, will be renamed to . @@ -108,10 +108,11 @@ OPTIONS Set up configuration so that git-pull will automatically retrieve data from the remote branch. Use this if you always pull from the same remote branch into the new branch, or if you - don't want to use "git pull " explicitly. Set the - branch.autosetupmerge configuration variable to true if you + don't want to use "git pull " explicitly. + This behavior is the default. Set the + branch.autosetupmerge configuration variable to false if you want git-checkout and git-branch to always behave as if - '--track' were given. + '--no-track' were given. --no-track:: When a branch is created off a remote branch, diff --git a/git-checkout.html b/git-checkout.html index 06b86e1c8..83420b046 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -334,10 +334,11 @@ working tree.

set up configuration so that git-pull will automatically retrieve data from the remote branch. Use this if you always pull from the same remote branch into the new branch, or if you - don't want to use "git pull <repository> <refspec>" explicitly. Set the - branch.autosetupmerge configuration variable to true if you + don't want to use "git pull <repository> <refspec>" explicitly. + This behavior is the default. Set the + branch.autosetupmerge configuration variable to false if you want git-checkout and git-branch to always behave as if - --track were given. + --no-track were given.

@@ -540,7 +541,7 @@ $ git add frotz diff --git a/git-checkout.txt b/git-checkout.txt index 584359ff3..b4cfa044b 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -52,10 +52,11 @@ OPTIONS set up configuration so that git-pull will automatically retrieve data from the remote branch. Use this if you always pull from the same remote branch into the new branch, or if you - don't want to use "git pull " explicitly. Set the - branch.autosetupmerge configuration variable to true if you + don't want to use "git pull " explicitly. + This behavior is the default. Set the + branch.autosetupmerge configuration variable to false if you want git-checkout and git-branch to always behave as if - '--track' were given. + '--no-track' were given. --no-track:: When -b is given and a branch is created off a remote branch, diff --git a/git-config.html b/git-config.html index a92886135..9f6e96bd5 100644 --- a/git-config.html +++ b/git-config.html @@ -1153,7 +1153,7 @@ branch.autosetupmerge so that git-pull(1) will appropriately merge from that remote branch. Note that even if this option is not set, this behavior can be chosen per-branch using the --track - and --no-track options. This option defaults to false. + and --no-track options. This option defaults to true.

@@ -2220,7 +2220,7 @@ web.browser diff --git a/git-describe.html b/git-describe.html index 54716684f..7c33eeaca 100644 --- a/git-describe.html +++ b/git-describe.html @@ -350,6 +350,15 @@ additional commits and the abbreviated object name of the commit.

be printed to standard out.

+
+--match <pattern> +
+
+

+ Only consider tags matching the given pattern (can be used to avoid + leaking private tags made from the repository). +

+

EXAMPLES

@@ -428,7 +437,7 @@ updated by Shawn Pearce <spearce@spearce.org>.

diff --git a/git-describe.txt b/git-describe.txt index 0742152b8..1c3dfb40c 100644 --- a/git-describe.txt +++ b/git-describe.txt @@ -51,6 +51,10 @@ OPTIONS being employed to standard error. The tag name will still be printed to standard out. +--match :: + Only consider tags matching the given pattern (can be used to avoid + leaking private tags made from the repository). + EXAMPLES -------- diff --git a/git-pull.html b/git-pull.html index da9aa1981..8f555da6c 100644 --- a/git-pull.html +++ b/git-pull.html @@ -795,13 +795,10 @@ ours was rebased since last fetched, the rebase uses that information to avoid rebasing non-local changes.

-
-
-
*NOTE:* This is a potentially _dangerous_ mode of operation.
+
NOTE: This is a potentially _dangerous_ mode of operation.
 It rewrites history, which does not bode well when you
-published that history already.  Do *not* use this option
-unless you have read linkgit:git-rebase[1] carefully.
-
+published that history already. Do not use this option +unless you have read git-rebase(1) carefully.

--no-rebase @@ -973,7 +970,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/git-pull.txt b/git-pull.txt index 4cc633a5e..179bdfc69 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -39,11 +39,11 @@ include::merge-strategies.txt[] there is a remote ref for the upstream branch, and this branch was rebased since last fetched, the rebase uses that information to avoid rebasing non-local changes. - - *NOTE:* This is a potentially _dangerous_ mode of operation. - It rewrites history, which does not bode well when you - published that history already. Do *not* use this option - unless you have read linkgit:git-rebase[1] carefully. ++ +*NOTE:* This is a potentially _dangerous_ mode of operation. +It rewrites history, which does not bode well when you +published that history already. Do *not* use this option +unless you have read linkgit:git-rebase[1] carefully. \--no-rebase:: Override earlier \--rebase. diff --git a/git-send-email.html b/git-send-email.html index 5227151f8..fc370192e 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -416,15 +416,58 @@ enabled interface to provide the necessary information.

---smtp-user, --smtp-pass +--smtp-user

- Username and password for SMTP-AUTH. Defaults are the values of - the configuration values sendemail.smtpuser and - sendemail.smtppass, but see also sendemail.identity. - If not set, authentication is not attempted. + Username for SMTP-AUTH. In place of this option, the following + configuration variables can be specified:

+
    +
  • +

    +sendemail.smtpuser +

    +
    • +
  • +

    +sendemail.<identity>.smtpuser (see sendemail.identity). +

    +
    • +
+

However, --smtp-user always overrides these variables.

+

If a username is not specified (with --smtp-user or a +configuration variable), then authentication is not attempted.

+
+
+--smtp-pass +
+
+

+ Password for SMTP-AUTH. The argument is optional: If no + argument is specified, then the empty string is used as + the password. +

+

In place of this option, the following configuration variables +can be specified:

+
    +
  • +

    +sendemail.smtppass +

    +
    • +
  • +

    +sendemail.<identity>.smtppass (see sendemail.identity). +

    +
    • +
+

However, --smtp-pass always overrides these variables.

+

Furthermore, passwords need not be specified in configuration files +or on the command line. If a username has been specified (with +--smtp-user or a configuration variable), but no password has been +specified (with --smtp-pass or a configuration variable), then the +user is prompted for a password while the input is masked for privacy.

--smtp-ssl @@ -457,6 +500,22 @@ enabled interface to provide the necessary information.

+--suppress-cc +
+
+

+ Specify an additional category of recipients to suppress the + auto-cc of. self will avoid including the sender, author will + avoid including the patch author, cc will avoid including anyone + mentioned in Cc lines in the patch, sob will avoid including + anyone mentioned in Signed-off-by lines, and cccmd will avoid + running the --cc-cmd. all will suppress all auto cc values. + Default is the value of sendemail.suppresscc configuration value; + if that is unspecified, default to self if --suppress-from is + specified, as well as sob if --no-signed-off-cc is specified. +

+
+
--thread, --no-thread
@@ -618,7 +677,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

diff --git a/git-send-email.txt b/git-send-email.txt index 0554f2b37..336d797e8 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -96,11 +96,40 @@ The --cc option must be repeated for each user you want on the cc list. servers typically listen to smtp port 25 and ssmtp port 465). ---smtp-user, --smtp-pass:: - Username and password for SMTP-AUTH. Defaults are the values of - the configuration values 'sendemail.smtpuser' and - 'sendemail.smtppass', but see also 'sendemail.identity'. - If not set, authentication is not attempted. +--smtp-user:: + Username for SMTP-AUTH. In place of this option, the following + configuration variables can be specified: ++ +-- + * sendemail.smtpuser + * sendemail..smtpuser (see sendemail.identity). +-- ++ +However, --smtp-user always overrides these variables. ++ +If a username is not specified (with --smtp-user or a +configuration variable), then authentication is not attempted. + +--smtp-pass:: + Password for SMTP-AUTH. The argument is optional: If no + argument is specified, then the empty string is used as + the password. ++ +In place of this option, the following configuration variables +can be specified: ++ +-- + * sendemail.smtppass + * sendemail..smtppass (see sendemail.identity). +-- ++ +However, --smtp-pass always overrides these variables. ++ +Furthermore, passwords need not be specified in configuration files +or on the command line. If a username has been specified (with +--smtp-user or a configuration variable), but no password has been +specified (with --smtp-pass or a configuration variable), then the +user is prompted for a password while the input is masked for privacy. --smtp-ssl:: If set, connects to the SMTP server using SSL. @@ -117,6 +146,17 @@ The --cc option must be repeated for each user you want on the cc list. Default is the value of 'sendemail.suppressfrom' configuration value; if that is unspecified, default to --no-suppress-from. +--suppress-cc:: + Specify an additional category of recipients to suppress the + auto-cc of. 'self' will avoid including the sender, 'author' will + avoid including the patch author, 'cc' will avoid including anyone + mentioned in Cc lines in the patch, 'sob' will avoid including + anyone mentioned in Signed-off-by lines, and 'cccmd' will avoid + running the --cc-cmd. 'all' will suppress all auto cc values. + Default is the value of 'sendemail.suppresscc' configuration value; + if that is unspecified, default to 'self' if --suppress-from is + specified, as well as 'sob' if --no-signed-off-cc is specified. + --thread, --no-thread:: If this is set, the In-Reply-To header will be set on each email sent. If disabled with "--no-thread", no emails will have the In-Reply-To diff --git a/git-svn.html b/git-svn.html index 486ec0a8a..dca6f71be 100644 --- a/git-svn.html +++ b/git-svn.html @@ -555,6 +555,17 @@ and have no uncommitted changes.

Any other arguments are passed directly to `git log'

+
+blame +
+
+

+ Show what revision and author last modified each line of a file. This is + identical to `git blame', but SVN revision numbers are shown instead of git + commit hashes. +

+

All arguments are passed directly to `git blame'.

+
@@ -1074,7 +1085,7 @@ should be manually entered with a text-editor or using diff --git a/git-svn.txt b/git-svn.txt index b1d527f74..340f1be02 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -161,6 +161,13 @@ New features: + Any other arguments are passed directly to `git log' +'blame':: + Show what revision and author last modified each line of a file. This is + identical to `git blame', but SVN revision numbers are shown instead of git + commit hashes. ++ +All arguments are passed directly to `git blame'. + -- 'find-rev':: When given an SVN revision number of the form 'rN', returns the