From: Junio C Hamano Date: Mon, 28 Jul 2008 00:03:31 +0000 (+0000) Subject: Autogenerated HTML docs for v1.6.0-rc1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=85c71579a9e49243fec14ea01af832f41eeb1823;p=git.git Autogenerated HTML docs for v1.6.0-rc1 --- diff --git a/RelNotes-1.6.0.txt b/RelNotes-1.6.0.txt index 7da62d08d..2542cf53d 100644 --- a/RelNotes-1.6.0.txt +++ b/RelNotes-1.6.0.txt @@ -15,6 +15,9 @@ release, but users are again strongly encouraged to adjust their scripts to use "git xyzzy" form, as we will stop installing "git-xyzzy" hardlinks for built-in commands in later releases. +An earlier change to page "git status" output was overwhelmingly unpopular +and has been reverted. + Source changes needed for porting to MinGW environment are now all in the main git.git codebase. @@ -179,6 +182,10 @@ Updates since v1.5.6 * "git rerere" can be told to update the index with auto-reused resolution with rerere.autoupdate configuration variable. +* git-rev-parse learned $commit^! and $commit^@ notations used in "log" + family. These notations are available in gitk as well, because the gitk + command internally uses rev-parse to interpret its arguments. + * git-rev-list learned --children option to show child commits it encountered during the traversal, instead of shoing parent commits. @@ -196,6 +203,9 @@ Updates since v1.5.6 * git-status gives the remote tracking statistics similar to the way git-checkout reports by how many commits your branch is ahead/behind. +* "git-svn dcommit" is now aware of auto-props setting the subversion user + has. + * You can tell "git status -u" to even more aggressively omit checking untracked files with --untracked-files=no. @@ -215,8 +225,15 @@ Fixes since v1.5.6 All of the fixes in v1.5.6 maintenance series are included in this release, unless otherwise noted. +* git-clone ignored its -u option; the fix needs to be backported to + 'maint'; + +* git-mv used to lose the distinction between changes that are staged + and that are only in the working tree, by staging both in the index + after moving such a path. + --- exec >/var/tmp/1 -O=v1.5.6.4-432-g6796399 +O=v1.6.0-rc0-104-g81dc230 echo O=$(git describe refs/heads/master) git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/config.txt b/config.txt index 798b55151..1a13abc92 100644 --- a/config.txt +++ b/config.txt @@ -92,7 +92,7 @@ Example # Our diff algorithm [diff] - external = "/usr/local/bin/gnu-diff -u" + external = /usr/local/bin/diff-wrapper renames = true [branch "devel"] @@ -563,9 +563,11 @@ diff.autorefreshindex:: diff.external:: If this config variable is set, diff generation is not performed using the internal diff machinery, but using the - given command. Note: if you want to use an external diff - program only on a subset of your files, you might want to - use linkgit:gitattributes[5] instead. + given command. Can be overridden with the `GIT_EXTERNAL_DIFF' + environment variable. The command is called with parameters + as described under "git Diffs" in linkgit:git[1]. Note: if + you want to use an external diff program only on a subset of + your files, you might want to use linkgit:gitattributes[5] instead. diff.renameLimit:: The number of files to consider when performing the copy/rename diff --git a/git-config.html b/git-config.html index ef0513f26..ce34a345d 100644 --- a/git-config.html +++ b/git-config.html @@ -669,7 +669,7 @@ GIT_CONFIG 
; Our diff algorithm
 [diff]
-        external = "/usr/local/bin/gnu-diff -u"
+        external = /usr/local/bin/diff-wrapper
         renames = true
@@ -830,7 +830,7 @@ customary UNIX fashion.

# Our diff algorithm
 [diff]
-        external = "/usr/local/bin/gnu-diff -u"
+        external = /usr/local/bin/diff-wrapper
         renames = true
@@ -1542,9 +1542,11 @@ diff.external

If this config variable is set, diff generation is not performed using the internal diff machinery, but using the - given command. Note: if you want to use an external diff - program only on a subset of your files, you might want to - use gitattributes(5) instead. + given command. Can be overridden with the `GIT_EXTERNAL_DIFF' + environment variable. The command is called with parameters + as described under "git Diffs" in git(1). Note: if + you want to use an external diff program only on a subset of + your files, you might want to use gitattributes(5) instead.

@@ -2686,7 +2688,7 @@ web.browser
diff --git a/git-config.txt b/git-config.txt index 697824cba..28e186109 100644 --- a/git-config.txt +++ b/git-config.txt @@ -222,7 +222,7 @@ Given a .git/config like this: ; Our diff algorithm [diff] - external = "/usr/local/bin/gnu-diff -u" + external = /usr/local/bin/diff-wrapper renames = true ; Proxy settings diff --git a/git-log.html b/git-log.html index 48e952527..d6f956bc5 100644 --- a/git-log.html +++ b/git-log.html @@ -874,7 +874,7 @@ each commit introduces are shown.

- Show only commits that affect the specified paths. + Show only commits that affect any of the specified paths.

@@ -2030,7 +2030,7 @@ reversible operation.

diff --git a/git-log.txt b/git-log.txt index 5a58d5b03..05cbac56a 100644 --- a/git-log.txt +++ b/git-log.txt @@ -58,7 +58,7 @@ include::diff-options.txt[] its size is not included. ...:: - Show only commits that affect the specified paths. + Show only commits that affect any of the specified paths. include::rev-list-options.txt[] diff --git a/git-submodule.html b/git-submodule.html index 0c1b2a5a7..d13362077 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -375,7 +375,7 @@ add

Add the given repository as a submodule at the given path to the changeset to be committed next to the current - project: the current project is termed termed the "superproject". + project: the current project is termed the "superproject".

This requires two arguments: <repository> and <path>.

<repository> is the URL of the new submodule's origin repository. @@ -533,7 +533,7 @@ for details.

diff --git a/git-submodule.txt b/git-submodule.txt index 829b03201..35efeefb3 100644 --- a/git-submodule.txt +++ b/git-submodule.txt @@ -63,7 +63,7 @@ COMMANDS add:: Add the given repository as a submodule at the given path to the changeset to be committed next to the current - project: the current project is termed termed the "superproject". + project: the current project is termed the "superproject". + This requires two arguments: and . +