From: Junio C Hamano Date: Wed, 12 Aug 2009 23:15:55 +0000 (-0700) Subject: Merge branch 'maint-1.6.3' into maint X-Git-Tag: v1.6.4.1~10 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe?hp=-c Merge branch 'maint-1.6.3' into maint * maint-1.6.3: Change mentions of "git programs" to "git commands" Documentation: merge: one is required help.c: give correct structure's size to memset() --- 2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe diff --combined Documentation/config.txt index c6f09f801a,181c2f9bde..e94a8ab746 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@@ -49,8 -49,7 +49,8 @@@ There is also a case insensitive altern In this syntax, subsection names follow the same restrictions as for section names. -All the other lines are recognized as setting variables, in the form +All the other lines (and the remainder of the line after the section +header) are recognized as setting variables, in the form 'name = value'. If there is no equal sign on the line, the entire line is taken as 'name' and the variable is recognized as boolean "true". The variable names are case-insensitive and only alphanumeric @@@ -605,19 -604,13 +605,19 @@@ color.interactive.: Use customized color for 'git-add --interactive' output. `` may be `prompt`, `header`, `help` or `error`, for four distinct types of normal output from interactive - programs. The values of these variables may be specified as + commands. The values of these variables may be specified as in color.branch.. color.pager:: A boolean to enable/disable colored output when the pager is in use (default is true). +color.showbranch:: + A boolean to enable/disable color in the output of + linkgit:git-show-branch[1]. May be set to `always`, + `false` (or `never`) or `auto` (or `true`), in which case colors are used + only when the output is to a terminal. Defaults to false. + color.status:: A boolean to enable/disable color in the output of linkgit:git-status[1]. May be set to `always`, @@@ -1046,12 -1039,6 +1046,12 @@@ http.sslKey: over HTTPS. Can be overridden by the 'GIT_SSL_KEY' environment variable. +http.sslCertPasswordProtected:: + Enable git's password prompt for the SSL certificate. Otherwise + OpenSSL will prompt the user, possibly many times, if the + certificate or private key is encrypted. Can be overridden by the + 'GIT_SSL_CERT_PASSWORD_PROTECTED' environment variable. + http.sslCAInfo:: File containing the certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the @@@ -1113,7 -1100,7 +1113,7 @@@ instaweb.port: linkgit:git-instaweb[1]. interactive.singlekey:: - In interactive programs, allow the user to provide one-letter + In interactive commands, allow the user to provide one-letter input with a single key (i.e., without hitting enter). Currently this is used only by the `\--patch` mode of linkgit:git-add[1]. Note that this setting is silently @@@ -1328,9 -1315,6 +1328,9 @@@ remote..url: The URL of a remote repository. See linkgit:git-fetch[1] or linkgit:git-push[1]. +remote..pushurl:: + The push URL of a remote repository. See linkgit:git-push[1]. + remote..proxy:: For remotes that require curl (http, https and ftp), the URL to the proxy to use for that remote. Set to the empty string to @@@ -1388,50 -1372,6 +1388,50 @@@ rerere.enabled: default enabled if you create `rr-cache` directory under `$GIT_DIR`, but can be disabled by setting this option to false. +sendemail.identity:: + A configuration identity. When given, causes values in the + 'sendemail.' subsection to take precedence over + values in the 'sendemail' section. The default identity is + the value of 'sendemail.identity'. + +sendemail.smtpencryption:: + See linkgit:git-send-email[1] for description. Note that this + setting is not subject to the 'identity' mechanism. + +sendemail.smtpssl:: + Deprecated alias for 'sendemail.smtpencryption = ssl'. + +sendemail..*:: + Identity-specific versions of the 'sendemail.*' parameters + found below, taking precedence over those when the this + identity is selected, through command-line or + 'sendemail.identity'. + +sendemail.aliasesfile:: +sendemail.aliasfiletype:: +sendemail.bcc:: +sendemail.cc:: +sendemail.cccmd:: +sendemail.chainreplyto:: +sendemail.confirm:: +sendemail.envelopesender:: +sendemail.from:: +sendemail.multiedit:: +sendemail.signedoffbycc:: +sendemail.smtppass:: +sendemail.suppresscc:: +sendemail.suppressfrom:: +sendemail.to:: +sendemail.smtpserver:: +sendemail.smtpserverport:: +sendemail.smtpuser:: +sendemail.thread:: +sendemail.validate:: + See linkgit:git-send-email[1] for description. + +sendemail.signedoffcc:: + Deprecated alias for 'sendemail.signedoffbycc'. + showbranch.default:: The default set of branches for linkgit:git-show-branch[1]. See linkgit:git-show-branch[1]. diff --combined Documentation/git-rev-list.txt index a765cfa4d2,ae1186e340..974d9f527f --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.txt @@@ -14,7 -14,6 +14,7 @@@ SYNOPSI [ \--max-age=timestamp ] [ \--min-age=timestamp ] [ \--sparse ] + [ \--merges ] [ \--no-merges ] [ \--first-parent ] [ \--remove-empty ] @@@ -84,7 -83,7 +84,7 @@@ between the two operands. The followin $ git rev-list A...B ----------------------------------------------------------------------- - 'git-rev-list' is a very essential git program, since it + 'rev-list' is a very essential git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git-bisect' and diff --combined Documentation/git.txt index 5fd5953e29,8fbe187fb3..5832c752e1 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@@ -43,19 -43,7 +43,19 @@@ unreleased) version of git, that is ava branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.6.3/git.html[documentation for release 1.6.3] +* link:v1.6.4/git.html[documentation for release 1.6.4] + +* release notes for + link:RelNotes-1.6.4.txt[1.6.4]. + +* link:v1.6.3.4/git.html[documentation for release 1.6.3.4] + +* release notes for + link:RelNotes-1.6.3.4.txt[1.6.3.4], + link:RelNotes-1.6.3.3.txt[1.6.3.3], + link:RelNotes-1.6.3.2.txt[1.6.3.2], + link:RelNotes-1.6.3.1.txt[1.6.3.1], + link:RelNotes-1.6.3.txt[1.6.3]. * release notes for link:RelNotes-1.6.2.5.txt[1.6.2.5], @@@ -327,7 -315,7 +327,7 @@@ Synching repositorie include::cmds-synchingrepositories.txt[] - The following are helper programs used by the above; end users + The following are helper commands used by the above; end users typically do not use them directly. include::cmds-synchelpers.txt[] diff --combined help.c index 6c46d8b494,da0cca0a15..294337e71c --- a/help.c +++ b/help.c @@@ -100,7 -100,7 +100,7 @@@ static void pretty_print_string_list(st if (space < max_cols) cols = max_cols / space; - rows = (cmds->cnt + cols - 1) / cols; + rows = DIV_ROUND_UP(cmds->cnt, cols); for (i = 0; i < rows; i++) { printf(" "); @@@ -302,7 -302,7 +302,7 @@@ const char *help_unknown_cmd(const cha struct cmdnames main_cmds, other_cmds; memset(&main_cmds, 0, sizeof(main_cmds)); - memset(&other_cmds, 0, sizeof(main_cmds)); + memset(&other_cmds, 0, sizeof(other_cmds)); memset(&aliases, 0, sizeof(aliases)); git_config(git_unknown_cmd_config, NULL); @@@ -334,7 -334,7 +334,7 @@@ const char *assumed = main_cmds.names[0]->name; main_cmds.names[0] = NULL; clean_cmdnames(&main_cmds); - fprintf(stderr, "WARNING: You called a Git program named '%s', " + fprintf(stderr, "WARNING: You called a Git command named '%s', " "which does not exist.\n" "Continuing under the assumption that you meant '%s'\n", cmd, assumed);