From c5653d7925386e4ffaf82750f0bae29b20145649 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 2 Sep 2007 06:25:16 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3 --- RelNotes-1.5.3.txt | 28 +++++++++++++++++++++------- git-rebase.html | 6 +++--- git-rebase.txt | 4 ++-- git-send-email.html | 21 ++++++++++++++++++++- git-send-email.txt | 9 +++++++++ 5 files changed, 55 insertions(+), 13 deletions(-) diff --git a/RelNotes-1.5.3.txt b/RelNotes-1.5.3.txt index 51ff53b37..317c8b9db 100644 --- a/RelNotes-1.5.3.txt +++ b/RelNotes-1.5.3.txt @@ -122,6 +122,9 @@ Updates since v1.5.2 - "git send-email" can be told not to thread the messages when sending out more than one patches. + - "git send-email" can also be told how to find whom to cc the + message to for each message via --cc-cmd. + - "git config" learned NUL terminated output format via -z to help scripts. @@ -148,6 +151,9 @@ Updates since v1.5.2 - "git clone" uses -l (hardlink files under .git) by default when cloning locally. + - URL used for "git clone" and friends can specify nonstandard SSH port + by using sh://host:port/path/to/repo syntax. + - "git bundle create" can now create a bundle without negative refs, i.e. "everything since the beginning up to certain points". @@ -155,8 +161,13 @@ Updates since v1.5.2 recursively descends into trees by default. - "git diff" does not show differences that come only from - stat-dirtiness in the form of "diff --git" header anymore. When - generating a textual diff, it shows a warning message at the end. + stat-dirtiness in the form of "diff --git" header anymore. + It runs "update-index --refresh" silently as needed. + + - "git tag -l" used to match tags by globbing its parameter as if it + has wildcard '*' on both ends, which made "git tag -l gui" to match + tag 'gitgui-0.7.0'; this was very annoying. You now have to add + asterisk on the sides you want to wildcard yourself. - The editor to use with many interactive commands can be overridden with GIT_EDITOR environment variable, or if it @@ -327,6 +338,13 @@ this release, unless otherwise noted. - "gitweb" had trouble handling non UTF-8 text with older Encode.pm Perl module. + - "git svn" misparsed the data from the commits in the repository when + the user had "color.diff = true" in the configuration. This has been + fixed. + + - There was a case where "git svn dcommit" clobbered changes made on the + SVN side while committing multiple changes. + - "git-write-tree" had a bad interaction with racy-git avoidance and gitattributes mechanisms. @@ -345,8 +363,4 @@ this release, unless otherwise noted. inconsistency was introduced somewhere in v1.3.0 series but now has been corrected. --- -exec >/var/tmp/1 -O=v1.5.3-rc7-15-ga65f200 -echo O=`git describe refs/heads/master` -git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint + - "git rebase -m" incorrectly displayed commits that were skipped. diff --git a/git-rebase.html b/git-rebase.html index 515396b71..1599bd5a1 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -273,7 +273,7 @@ git-rebase(1) Manual Page

SYNOPSIS

-
git-rebase [-i | --interactive] [-v | --verbose] [--merge] [-C<n>] +
git-rebase [-i | --interactive] [-v | --verbose] [-m | --merge] [-C<n>] [-p | --preserve-merges] [--onto <newbase>] <upstream> [<branch>] git-rebase --continue | --skip | --abort
@@ -469,7 +469,7 @@ desired resolution, you can continue the rebasing process with

---merge +-m, --merge

@@ -800,7 +800,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de>

diff --git a/git-rebase.txt b/git-rebase.txt index 640ea3b38..61b1810db 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -8,7 +8,7 @@ git-rebase - Forward-port local commits to the updated upstream head SYNOPSIS -------- [verse] -'git-rebase' [-i | --interactive] [-v | --verbose] [--merge] [-C] +'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge] [-C] [-p | --preserve-merges] [--onto ] [] 'git-rebase' --continue | --skip | --abort @@ -188,7 +188,7 @@ OPTIONS --skip:: Restart the rebasing process by skipping the current patch. ---merge:: +-m, \--merge:: Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. diff --git a/git-send-email.html b/git-send-email.html index 21e09fdfc..262266e60 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -304,6 +304,17 @@ enabled interface to provide the necessary information.

The --cc option must be repeated for each user you want on the cc list.

+--cc-cmd +
+
+

+ Specify a command to execute once per patch file which + should generate patch file specific "Cc:" entries. + Output of this command must be single email address per line. + Default is the value of sendemail.cccmd configuration value. +

+
+
--chain-reply-to, --no-chain-reply-to
@@ -470,6 +481,14 @@ sendemail.aliasfiletype

+sendemail.cccmd +
+
+

+ Command to execute to generate per patch file specific "Cc:"s. +

+
+
sendemail.bcc
@@ -512,7 +531,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

diff --git a/git-send-email.txt b/git-send-email.txt index 8231286e0..16bfd7be2 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -34,6 +34,12 @@ The --bcc option must be repeated for each user you want on the bcc list. + The --cc option must be repeated for each user you want on the cc list. +--cc-cmd:: + Specify a command to execute once per patch file which + should generate patch file specific "Cc:" entries. + Output of this command must be single email address per line. + Default is the value of 'sendemail.cccmd' configuration value. + --chain-reply-to, --no-chain-reply-to:: If this is set, each email will be sent as a reply to the previous email sent. If disabled with "--no-chain-reply-to", all emails after @@ -124,6 +130,9 @@ sendemail.aliasfiletype:: Format of the file(s) specified in sendemail.aliasesfile. Must be one of 'mutt', 'mailrc', 'pine', or 'gnus'. +sendemail.cccmd:: + Command to execute to generate per patch file specific "Cc:"s. + sendemail.bcc:: Email address (or alias) to always bcc. -- 2.26.2