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.
* "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.
* 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.
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
# Our diff algorithm
[diff]
- external = "/usr/local/bin/gnu-diff -u"
+ external = /usr/local/bin/diff-wrapper
renames = true
[branch "devel"]
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
<div class="content">\r
<pre><tt>; Our diff algorithm\r
[diff]\r
- external = "/usr/local/bin/gnu-diff -u"\r
+ external = /usr/local/bin/diff-wrapper\r
renames = true</tt></pre>\r
</div></div>\r
<div class="literalblock">\r
<div class="content">\r
<pre><tt># Our diff algorithm\r
[diff]\r
- external = "/usr/local/bin/gnu-diff -u"\r
+ external = /usr/local/bin/diff-wrapper\r
renames = true</tt></pre>\r
</div></div>\r
<div class="literalblock">\r
<p>\r
If this config variable is set, diff generation is not\r
performed using the internal diff machinery, but using the\r
- given command. Note: if you want to use an external diff\r
- program only on a subset of your files, you might want to\r
- use <a href="gitattributes.html">gitattributes(5)</a> instead.\r
+ given command. Can be overridden with the `GIT_EXTERNAL_DIFF'\r
+ environment variable. The command is called with parameters\r
+ as described under "git Diffs" in <a href="git.html">git(1)</a>. Note: if\r
+ you want to use an external diff program only on a subset of\r
+ your files, you might want to use <a href="gitattributes.html">gitattributes(5)</a> instead.\r
</p>\r
</dd>\r
<dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-26 06:45:38 UTC\r
+Last updated 2008-07-28 00:02:59 UTC\r
</div>\r
</div>\r
</body>\r
; Our diff algorithm
[diff]
- external = "/usr/local/bin/gnu-diff -u"
+ external = /usr/local/bin/diff-wrapper
renames = true
; Proxy settings
</dt>\r
<dd>\r
<p>\r
- Show only commits that affect the specified paths.\r
+ Show only commits that affect any of the specified paths.\r
</p>\r
</dd>\r
</dl></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-24 04:02:42 UTC\r
+Last updated 2008-07-28 00:02:59 UTC\r
</div>\r
</div>\r
</body>\r
its size is not included.
<paths>...::
- Show only commits that affect the specified paths.
+ Show only commits that affect any of the specified paths.
include::rev-list-options.txt[]
<p>\r
Add the given repository as a submodule at the given path\r
to the changeset to be committed next to the current\r
- project: the current project is termed termed the "superproject".\r
+ project: the current project is termed the "superproject".\r
</p>\r
<div class="para"><p>This requires two arguments: <repository> and <path>.</p></div>\r
<div class="para"><p><repository> is the URL of the new submodule's origin repository.\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-20 01:23:35 UTC\r
+Last updated 2008-07-28 00:03:03 UTC\r
</div>\r
</div>\r
</body>\r
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>.
+
projects / git.git / commitdiff