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
--------------------
* 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
* 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.
(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.
* 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.
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 <src> <dst>" did not create leading directories for <dst>
- 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
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
variables. The <em>--global</em> and the <em>--system</em> options will limit the file used\r
to the global or system-wide file respectively. The GIT_CONFIG environment\r
variable has a similar effect, but you can specify any filename you want.</p></div>\r
-<div class="para"><p>The GIT_CONFIG_LOCAL environment variable on the other hand only changes\r
-the name used instead of the repository configuration file. The global and\r
-the system-wide configuration files will still be read. (For writing options\r
-this will obviously result in the same behavior as using GIT_CONFIG.)</p></div>\r
</div>\r
<h2 id="_environment">ENVIRONMENT</h2>\r
<div class="sectionbody">\r
"--system" option forces this to $(prefix)/etc/gitconfig.\r
</p>\r
</dd>\r
-<dt>\r
-GIT_CONFIG_LOCAL\r
-</dt>\r
-<dd>\r
-<p>\r
- Take the configuration from the given file instead if .git/config.\r
- Still read the global and the system-wide configuration files, though.\r
-</p>\r
-</dd>\r
</dl></div>\r
<div class="para"><p>See also <a href="#FILES">[FILES]</a>.</p></div>\r
</div>\r
</p>\r
</dd>\r
<dt>\r
+rerere.autoupdate\r
+</dt>\r
+<dd>\r
+<p>\r
+ When set to true, <tt>git-rerere</tt> updates the index with the\r
+ resulting contents after it cleanly resolves conflicts using\r
+ previously recorded resolution. Defaults to false.\r
+</p>\r
+</dd>\r
+<dt>\r
rerere.enabled\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:39 UTC\r
+Last updated 2008-07-07 22:10:11 UTC\r
</div>\r
</div>\r
</body>\r
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
-----------
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 <<FILES>>.
It is the set of commits that are reachable from either one of\r
<tt>r1</tt> or <tt>r2</tt> but not from both.</p></div>\r
<div class="para"><p>Two other shorthands for naming a set that is formed by a commit\r
-and its parent commits exists. <tt>r1^@</tt> notation means all\r
+and its parent commits exist. The <tt>r1^@</tt> notation means all\r
parents of <tt>r1</tt>. <tt>r1^!</tt> includes commit <tt>r1</tt> but excludes\r
-its all parents.</p></div>\r
+all of its parents.</p></div>\r
<div class="para"><p>Here are a handful of examples:</p></div>\r
<div class="literalblock">\r
<div class="content">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:00 UTC\r
+Last updated 2008-07-07 22:10:11 UTC\r
</div>\r
</div>\r
</body>\r
`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:
option and the core.worktree configuration variable.\r
</p>\r
</dd>\r
+<dt>\r
+<em>GIT_CEILING_DIRECTORIES</em>\r
+</dt>\r
+<dd>\r
+<p>\r
+ This should be a colon-separated list of absolute paths.\r
+ If set, it is a list of directories that git should not chdir\r
+ up into while looking for a repository directory.\r
+ It will not exclude the current working directory or\r
+ a GIT_DIR set on the command line or in the environment.\r
+ (Useful for excluding slow-loading network directories.)\r
+</p>\r
+</dd>\r
</dl></div>\r
<h3 id="_git_commits">git Commits</h3><div style="clear:left"></div>\r
<div class="vlist"><dl>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:08 UTC\r
+Last updated 2008-07-07 22:10:12 UTC\r
</div>\r
</div>\r
</body>\r
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'::
projects / git.git / commitdiff