From: Junio C Hamano Date: Fri, 29 Feb 2008 09:21:50 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.4.3-340-g97b97 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=40f54d31bd2b56b128e9f450b3830133e999b382;p=git.git Autogenerated HTML docs for v1.5.4.3-340-g97b97 --- diff --git a/RelNotes-1.5.4.4.txt b/RelNotes-1.5.4.4.txt new file mode 100644 index 000000000..5bfdb3537 --- /dev/null +++ b/RelNotes-1.5.4.4.txt @@ -0,0 +1,26 @@ +GIT v1.5.4.4 Release Notes +========================== + +Fixes since v1.5.4.3 +-------------------- + + * "git cvsexportcommit -w $cvsdir" misbehaved when GIT_DIR is set to a + relative directory. + + * "git http-push" had an invalid memory access that could lead it to + segfault. + + * When "git rebase -i" gave control back to the user for a commit that is + marked to be edited, it just said "modify it with commit --amend", + without saying what to do to continue after modifying it. Give an + explicit instruction to run "rebase --continue" to be more helpful. + + * "git send-email" in 1.5.4.3 issued a bogus empty In-Reply-To: header. + +Also included are a handful documentation updates. + +--- +exec >/var/tmp/1 +echo O=$(git describe maint) +O=v1.5.4.3 +git shortlog --no-merges $O..maint diff --git a/RelNotes-1.5.5.txt b/RelNotes-1.5.5.txt index c8b4f72c2..849b6b960 100644 --- a/RelNotes-1.5.5.txt +++ b/RelNotes-1.5.5.txt @@ -26,21 +26,85 @@ Updates since v1.5.4 * You can be warned when core.autocrlf conversion is applied in such a way that results in an irreversible conversion. + * A catch-all "color.ui" configuration variable can be used to + enable coloring of all color-capable commands, instead of + individual ones such as "color.status" and "color.branch". + + * The commands refused to take absolute pathnames where they + require pathnames relative to the work tree or the current + subdirectory. They now can take absolute pathnames in such a + case as long as the pathnames do not refer outside of the + work tree. E.g. "git add $(pwd)/foo" now works. + + * Error messages used to be sent to stderr, only to get hidden, + when $PAGER was in use. They now are sent to stdout along + with the command output to be shown in the $PAGER. + * A pattern "foo/" in .gitignore file now matches a directory "foo". Pattern "foo" also matches as before. + * bash completion's prompt helper function can talk about + operation in-progress (e.g. merge, rebase, etc.). + + * Configuration variables "url..insteadof = " can be + used to tell "git-fetch" and "git-push" to use different URL than what + is given from the command line. + + * "git push HEAD" and "git push +HEAD" works as + expected; they push the current branch (and only the current branch). + In addition, HEAD can be written as the value of "remote..push" + configuration variable. + + * "git add -i" behaves better even before you make an initial commit. + + * After "git apply --whitespace=fix" fixes whitespace errors in a patch, + a line before the fix can appear as a context or preimage line in a + later patch, causing the patch not to apply. The command now knows to + see through whitespace fixes done to context lines to successfully + apply such a patch series. + + * "git branch" (and "git checkout -b") to branch from a local branch can + optionally set "branch..merge" to mark the new branch to build on + the other local branch, when "branch.autosetupmerge" is set to + "always". By default, this does not happen when branching from a local + branch. + + * "git checkout" to switch to a branch that has "branch..merge" set + (i.e. marked to build on another branch) reports how much the branch + and the other branch diverged. + + * When "git checkout" has to update a lot of paths, it used to be silent + for 4 seconds before it showed any progress report. It is now a bit + more impatient and starts showing progress report early. + + * "git commit" learned a new hook "prepare-commit-msg" that can + inspect what is going to be committed and prepare the commit + log message template to be edited. + * "git describe" learned to limit the tags to be used for naming with --match option. * "git describe --contains" now barfs when the named commit cannot be described. - * bash completion's prompt helper function can talk about - operation in-progress (e.g. merge, rebase, etc.). + * "git describe --exact-match" describes only commits that are tagged. - * "git commit" learned a new hook "prepare-commit-msg" that can - inspect what is going to be committed and prepare the commit - log message template to be edited. + * "git diff" learned "--relative" option to limit and output paths + relative to the current directory when working in a subdirectory. + + * "git diff" learned "--dirstat" option to show birds-eye-summary of + changes more concisely than "--diffstat". + + * "git format-patch" learned --cover-letter option to generate a cover + letter template. + + * "git grep" now knows "--name-only" is a synonym for the "-l" option. + + * "git help " now reports "'git ' is alias to ", + instead of saying "No manual entry for git-". + + * "git log --grep=" learned "--fixed-strings" option to look for + without treating it as a regular expression. * "git gui" learned an auto-spell checking. @@ -50,6 +114,9 @@ Updates since v1.5.4 * "git send-email" learned an easier way to suppress CC recipients. + * When the configuration variable "pack.threads" is set to 0, "git + repack" auto detects the number of CPUs and uses that many threads. + * Various "git cvsimport", "git cvsexportcommit", "git svn" and "git p4" improvements. @@ -61,6 +128,15 @@ Updates since v1.5.4 * It is now easier to write test scripts that records known breakages. + * "git checkout" is rewritten in C. + + * Two conflict hunks that are separated by a very short span of common + lines are now coalesced into one larger hunk, to make the result easier + to read. + + * Run-command API's use of file descriptors is documented clearer and + is more consistent now. + Fixes since v1.5.4 ------------------ @@ -68,11 +144,8 @@ Fixes since v1.5.4 All of the fixes in v1.5.4 maintenance series are included in this release, unless otherwise noted. - --- exec >/var/tmp/1 -O=v1.5.4 -O=v1.5.4.2-122-g7cb97da +O=v1.5.4.3-339-g7cf7f54 echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint - diff --git a/git-rev-list.html b/git-rev-list.html index bf709ac5a..cbfc86e1d 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -284,6 +284,9 @@ git-rev-list(1) Manual Page [ --full-history ] [ --not ] [ --all ] + [ --branches ] + [ --tags ] + [ --remotes ] [ --stdin ] [ --quiet ] [ --topo-order ] @@ -1201,7 +1204,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-rev-list.txt b/git-rev-list.txt index a8d489f9f..d80cdf550 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -20,6 +20,9 @@ SYNOPSIS [ \--full-history ] [ \--not ] [ \--all ] + [ \--branches ] + [ \--tags ] + [ \--remotes ] [ \--stdin ] [ \--quiet ] [ \--topo-order ] diff --git a/technical/api-diff.html b/technical/api-diff.html index 0d8457ad0..d5cdf8ca6 100644 --- a/technical/api-diff.html +++ b/technical/api-diff.html @@ -327,7 +327,7 @@ Once you finish feeding the pairs of files, call diffcore_std().

  • -Calling diffcore_flush() will produce the output. +Calling diff_flush() will produce the output.

    • @@ -582,7 +582,7 @@ RECURSIVE, TREE_IN_RECURSIVE diff --git a/technical/api-diff.txt b/technical/api-diff.txt index 83b007e70..20b0241d3 100644 --- a/technical/api-diff.txt +++ b/technical/api-diff.txt @@ -39,7 +39,7 @@ Calling sequence * Once you finish feeding the pairs of files, call `diffcore_std()`. This will tell the diffcore library to go ahead and do its work. -* Calling `diffcore_flush()` will produce the output. +* Calling `diff_flush()` will produce the output. Data structures