From: Junio C Hamano Date: Mon, 19 Mar 2007 10:43:30 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.1-rc1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b8c51282a8560ed048e98bc0db18fc66f6564b04;p=git.git Autogenerated HTML docs for v1.5.1-rc1 --- diff --git a/RelNotes-1.5.1.txt b/RelNotes-1.5.1.txt index f374e1c2c..f78cf56bc 100644 --- a/RelNotes-1.5.1.txt +++ b/RelNotes-1.5.1.txt @@ -25,6 +25,21 @@ Updates since v1.5.0 - "git diff --pretty=format:" to allow more flexible custom log output. + - "git diff --no-index" can read from '-' (standard input). + + - "git diff" also learned --exit-code to exit with non-zero + status when it found differences. In the future we might + want to make this the default but that would be a rather big + backward incompatible change; it will stay as an option for + now. + + - "git branch --track" can be used to set up configuration + variables to help it easier to base your work on branches + you track from a remote site. + + - "git format-patch --attach" now emits attachments. Use + --inline to get an inlined multipart/mixed. + - "git name-rev" learned --refs=, to limit the tags used for naming the given revisions only to the ones matching the given pattern. @@ -39,6 +54,9 @@ Updates since v1.5.0 - "git bundle" can help sneaker-netting your changes between repositories. + - "git mergetool" can help 3-way file-level conflict + resolution with your favorite graphical merge tools. + - A new configuration "core.symlinks" can be used to disable symlinks on filesystems that do not support them; they are checked out as regular files instead. @@ -46,6 +64,11 @@ Updates since v1.5.0 * Updated behaviour of existing commands. + - "git fsck" does not barf on corrupt loose objects. + + - "git archimport" allows remapping when coming up with git + branch names from arch names. + - git-svn got almost a rewrite. - core.autocrlf configuration, when set to 'true', makes git @@ -99,6 +122,25 @@ Updates since v1.5.0 - "git fetch" (hence "git clone" and "git pull") are less noisy when the output does not go to tty. + - "git fetch" between repositories with many refs were slow + even when there are not many changes that needed + transferring. This has been sped up by partially rewriting + the heaviest parts in C. + + - "git mailinfo" which splits an e-mail into a patch and the + metainformation was rewritten, thanks to Don Zickus. It + handles nested multipart better. + + - send-email learned configurable bcc and chain-reply-to. + + - Using objects from packs is now seriouly optimized by clever + use of a cache. This should be most noticeable in git-log + family of commands that involve reading many tree objects. + In addition, traversing revisions while filtering changes + with pathspecs is made faster by terminating the comparison + between the trees as early as possible. + + * Hooks - The sample update hook to show how to send out notification @@ -106,9 +148,15 @@ Updates since v1.5.0 the repository. Earlier, it showed new commits that appeared on the branch. + +* Others + + - git-revert, git-gc and git-cherry-pick are now built-ins. + + -- exec >/var/tmp/1 -O=v1.5.0.3-268-g3ddad98 +O=v1.5.0.5-446-g5d86501 echo O=`git describe master` git shortlog --no-merges $O..master ^maint diff --git a/config.txt b/config.txt index 953acaee4..cf1e04038 100644 --- a/config.txt +++ b/config.txt @@ -240,6 +240,19 @@ the largest projects. You probably do not need to adjust this value. + Common unit suffixes of 'k', 'm', or 'g' are supported. +core.deltaBaseCacheLimit:: + Maximum number of bytes to reserve for caching base objects + that multiple deltafied objects reference. By storing the + entire decompressed base objects in a cache Git is able + to avoid unpacking and decompressing frequently used base + objects multiple times. ++ +Default is 16 MiB on all platforms. This should be reasonable +for all users/operating systems, except on the largest projects. +You probably do not need to adjust this value. ++ +Common unit suffixes of 'k', 'm', or 'g' are supported. + alias.*:: Command aliases for the gitlink:git[1] command wrapper - e.g. after defining "alias.last = cat-file commit HEAD", the invocation @@ -460,7 +473,7 @@ merge.summary:: merge.tool:: Controls which merge resolution program is used by gitlink:git-mergetool[l]. Valid values are: "kdiff3", "tkdiff", - "meld", "xxdiff", "emerge" + "meld", "xxdiff", "emerge", "vimdiff" merge.verbosity:: Controls the amount of output shown by the recursive merge diff --git a/git-config.html b/git-config.html index ba6802199..2b544144b 100644 --- a/git-config.html +++ b/git-config.html @@ -868,6 +868,22 @@ the largest projects. You probably do not need to adjust this value.

Common unit suffixes of k, m, or g are supported.

+core.deltaBaseCacheLimit +
+
+

+ Maximum number of bytes to reserve for caching base objects + that multiple deltafied objects reference. By storing the + entire decompressed base objects in a cache Git is able + to avoid unpacking and decompressing frequently used base + objects multiple times. +

+

Default is 16 MiB on all platforms. This should be reasonable +for all users/operating systems, except on the largest projects. +You probably do not need to adjust this value.

+

Common unit suffixes of k, m, or g are supported.

+
+
alias.*
@@ -1267,7 +1283,7 @@ merge.tool

Controls which merge resolution program is used by git-mergetool(l). Valid values are: "kdiff3", "tkdiff", - "meld", "xxdiff", "emerge" + "meld", "xxdiff", "emerge", "vimdiff"

@@ -1523,7 +1539,7 @@ transfer.unpackLimit diff --git a/git-mergetool.html b/git-mergetool.html index a27739749..32065ec25 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -293,7 +293,7 @@ with merge conflicts.

Use the merge resolution program specified by <tool>. Valid merge tools are: - kdiff3, tkdiff, meld, xxdiff, and emerge. + kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.

@@ -319,7 +319,7 @@ will pick a suitable default.
diff --git a/git-mergetool.txt b/git-mergetool.txt index ae69a0eb8..5baaaca0b 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -25,7 +25,7 @@ OPTIONS -t or --tool=:: Use the merge resolution program specified by . Valid merge tools are: - kdiff3, tkdiff, meld, xxdiff, and emerge. + kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff. If a merge resolution program is not specified, 'git mergetool' will use the configuration variable merge.tool. If the diff --git a/git-send-email.html b/git-send-email.html index e05b0b9d0..6ad0c21d9 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -353,7 +353,8 @@ enabled interface to provide the necessary information.

- Do not add emails found in Signed-off-by: lines to the cc list. + Do not add emails found in Signed-off-by: or Cc: lines to the + cc list.

@@ -475,7 +476,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

diff --git a/git-send-email.txt b/git-send-email.txt index 9b3aabb6f..682313e95 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -60,7 +60,8 @@ The --cc option must be repeated for each user you want on the cc list. is not set, this will be prompted for. --no-signed-off-by-cc:: - Do not add emails found in Signed-off-by: lines to the cc list. + Do not add emails found in Signed-off-by: or Cc: lines to the + cc list. --quiet:: Make git-send-email less verbose. One line per email should be diff --git a/git.html b/git.html index ca8b5177d..4a0a1b6bd 100644 --- a/git.html +++ b/git.html @@ -2317,7 +2317,7 @@ contributors on the git-list <git@vger.kernel.org>.