From: Junio C Hamano Date: Mon, 7 Jul 2008 22:10:48 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.6.2-247-g923712 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=15048272f145e2a7ca7c8923c4a7bc5d14bf4913;p=git.git Autogenerated HTML docs for v1.5.6.2-247-g923712 --- diff --git a/RelNotes-1.6.0.txt b/RelNotes-1.6.0.txt index e5c285f9c..e1f013bd3 100644 --- a/RelNotes-1.6.0.txt +++ b/RelNotes-1.6.0.txt @@ -23,6 +23,13 @@ encoding introduced in v1.4.4. Pack idx files are using version 2 that allows larger packs and added robustness thanks to its CRC checking, introduced in v1.5.2. +GIT_CONFIG, which was only documented as affecting "git config", but +actually affected all git commands, now only affects "git config". +GIT_LOCAL_CONFIG, also only documented as affecting "git config" and +not different from GIT_CONFIG in a useful way, is removed. + +An ancient merge strategy "stupid" has been removed. + Updates since v1.5.6 -------------------- @@ -32,8 +39,13 @@ Updates since v1.5.6 * git-p4 in contrib learned "allowSubmit" configuration to control on which branch to allow "submit" subcommand. +* git-gui learned to stage changes per-line. + (portability) +* Changes for MinGW port have been merged, thanks to Johannes Sixt and + gangs. + * Sample hook scripts shipped in templates/ are now suffixed with *.sample. We used to prevent them from triggering by default by relying on the fact that we install them as unexecutable, but on @@ -48,7 +60,8 @@ Updates since v1.5.6 * Updated howto/update-hook-example -* Got rid of usage of "git-foo" from the tutorial. +* Got rid of usage of "git-foo" from the tutorial and made typography + more consistent. * Disambiguating "--" between revs and paths is finally documented. @@ -79,6 +92,11 @@ Updates since v1.5.6 (usability, bells and whistles) +* A new environment variable GIT_CEILING_DIRECTORIES can be used to stop + the discovery process of the toplevel of working tree; this may be useful + when you are working in a slow network disk and are outside any working tree, + as bash-completion and "git help" may still need to run in these places. + * git-apply can handle a patch that touches the same path more than once much better than before. @@ -102,13 +120,16 @@ Updates since v1.5.6 * fast-export learned to export and import marks file; this can be used to interface with fast-import incrementally. -* Original SHA-1 value for "update-ref -d" is optional now. +* "git rerere" can be told to update the index with auto-reused resolution + with rerere.autoupdate configuration variable. * git-send-mail can talk not just over SSL but over TLS now. * You can tell "git status -u" to even more aggressively omit checking untracked files with --untracked-files=no. +* Original SHA-1 value for "update-ref -d" is optional now. + * Error codes from gitweb are made more descriptive where possible, rather than "403 forbidden" as we used to issue everywhere. @@ -121,14 +142,12 @@ Fixes since v1.5.6 All of the fixes in v1.5.6 maintenance series are included in this release, unless otherwise noted. - * diff -c/--cc showed unnecessary "deletion" lines at the context - boundary (needs backmerge to maint). - - * "git-clone " did not create leading directories for - like the scripted version used to do (needs backport to maint). + * "git fetch" into an empty repository used to remind the fetch will + be huge by saying "no common commits", but it is already known by + the user anyway (need to backport 8cb560f to 'maint'). --- exec >/var/tmp/1 -O=v1.5.6.1-155-gaa0c1f2 +O=v1.5.6.2-246-g86d7244 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 a403d46c1..838794dca 100644 --- a/config.txt +++ b/config.txt @@ -658,6 +658,11 @@ gc.rerereunresolved:: kept for this many days when 'git-rerere gc' is run. The default is 15 days. See linkgit:git-rerere[1]. +rerere.autoupdate:: + When set to true, `git-rerere` updates the index with the + resulting contents after it cleanly resolves conflicts using + previously recorded resolution. Defaults to false. + rerere.enabled:: Activate recording of resolved conflicts, so that identical conflict hunks can be resolved automatically, should they diff --git a/git-config.html b/git-config.html index ad33cf1db..2a83c2021 100644 --- a/git-config.html +++ b/git-config.html @@ -630,10 +630,6 @@ and --unset. git-config will only ever change one file variables. The --global and the --system options will limit the file used to the global or system-wide file respectively. The GIT_CONFIG environment variable has a similar effect, but you can specify any filename you want.

-

The GIT_CONFIG_LOCAL environment variable on the other hand only changes -the name used instead of the repository configuration file. The global and -the system-wide configuration files will still be read. (For writing options -this will obviously result in the same behavior as using GIT_CONFIG.)

ENVIRONMENT

@@ -648,15 +644,6 @@ GIT_CONFIG "--system" option forces this to $(prefix)/etc/gitconfig.

-
-GIT_CONFIG_LOCAL -
-
-

- Take the configuration from the given file instead if .git/config. - Still read the global and the system-wide configuration files, though. -

-

See also [FILES].

@@ -1732,6 +1719,16 @@ gc.rerereunresolved

+rerere.autoupdate +
+
+

+ When set to true, git-rerere updates the index with the + resulting contents after it cleanly resolves conflicts using + previously recorded resolution. Defaults to false. +

+
+
rerere.enabled
@@ -2688,7 +2685,7 @@ web.browser diff --git a/git-config.txt b/git-config.txt index df419e21f..697824cba 100644 --- a/git-config.txt +++ b/git-config.txt @@ -191,11 +191,6 @@ variables. The '--global' and the '--system' options will limit the file used to the global or system-wide file respectively. The GIT_CONFIG environment variable has a similar effect, but you can specify any filename you want. -The GIT_CONFIG_LOCAL environment variable on the other hand only changes -the name used instead of the repository configuration file. The global and -the system-wide configuration files will still be read. (For writing options -this will obviously result in the same behavior as using GIT_CONFIG.) - ENVIRONMENT ----------- @@ -205,10 +200,6 @@ GIT_CONFIG:: Using the "--global" option forces this to ~/.gitconfig. Using the "--system" option forces this to $(prefix)/etc/gitconfig. -GIT_CONFIG_LOCAL:: - Take the configuration from the given file instead if .git/config. - Still read the global and the system-wide configuration files, though. - See also <>. diff --git a/git-rev-parse.html b/git-rev-parse.html index 54309af0a..fe70a422f 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -811,9 +811,9 @@ of r1 and r2 and is defined as It is the set of commits that are reachable from either one of r1 or r2 but not from both.

Two other shorthands for naming a set that is formed by a commit -and its parent commits exists. r1^@ notation means all +and its parent commits exist. The r1^@ notation means all parents of r1. r1^! includes commit r1 but excludes -its all parents.

+all of its parents.

Here are a handful of examples:

@@ -964,7 +964,7 @@ Junio C Hamano <junkio@cox.net> and Pierre Habouzit <madcoder@debian.or
diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 0501a8702..378a3124a 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -301,9 +301,9 @@ It is the set of commits that are reachable from either one of `r1` or `r2` but not from both. Two other shorthands for naming a set that is formed by a commit -and its parent commits exists. `r1{caret}@` notation means all +and its parent commits exist. The `r1{caret}@` notation means all parents of `r1`. `r1{caret}!` includes commit `r1` but excludes -its all parents. +all of its parents. Here are a handful of examples: diff --git a/git.html b/git.html index 97a27e19b..0c59a3959 100644 --- a/git.html +++ b/git.html @@ -1752,6 +1752,19 @@ git so take care if using Cogito etc.

option and the core.worktree configuration variable.

+
+GIT_CEILING_DIRECTORIES +
+
+

+ This should be a colon-separated list of absolute paths. + If set, it is a list of directories that git should not chdir + up into while looking for a repository directory. + It will not exclude the current working directory or + a GIT_DIR set on the command line or in the environment. + (Useful for excluding slow-loading network directories.) +

+

git Commits

@@ -2011,7 +2024,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index adc027ce4..b7546aca1 100644 --- a/git.txt +++ b/git.txt @@ -427,6 +427,14 @@ git so take care if using Cogito etc. This can also be controlled by the '--work-tree' command line option and the core.worktree configuration variable. +'GIT_CEILING_DIRECTORIES':: + This should be a colon-separated list of absolute paths. + If set, it is a list of directories that git should not chdir + up into while looking for a repository directory. + It will not exclude the current working directory or + a GIT_DIR set on the command line or in the environment. + (Useful for excluding slow-loading network directories.) + git Commits ~~~~~~~~~~~ 'GIT_AUTHOR_NAME'::