Deprecation notices
-------------------
- * Next feature release of git (this change is scheduled for v1.6.0)
+ * The next feature release of git (this change is scheduled for v1.6.0)
will by default install dashed form of commands (e.g. "git-commit")
outside of users' normal $PATH, and will install only selected
commands ("git" itself, and "gitk") in $PATH. This implies:
- - Using dashed form of git commands (e.g. "git-commit") from the
+ - Using dashed forms of git commands (e.g. "git-commit") from the
command line has been informally deprecated since early 2006, but
now it officially is, and will be removed in the future. Use
- dashless form (e.g. "git commit") instead.
+ dashless forms (e.g. "git commit") instead.
- - Using dashed from from your scripts, without first prepending the
+ - Using dashed forms from your scripts, without first prepending the
return value from "git --exec-path" to the scripts' PATH, has been
informally deprecated since early 2006, but now it officially is.
- - Use of dashed form with "PATH=$(git --exec-path):$PATH; export
+ - Use of dashed forms with "PATH=$(git --exec-path):$PATH; export
PATH" early in your script is not deprecated with this change.
Users are strongly encouraged to adjust their habits and scripts now
to prepare for this.
* The post-receive hook was introduced in March 2007 to supersede
- post-update hook, primarily to overcome the command line length
+ the post-update hook, primarily to overcome the command line length
limitation of the latter. Use of post-update hook will be deprecated
in future versions of git, starting from v1.6.0.
option, and will be removed in the future.
* "git peek-remote" is deprecated, as "git ls-remote" was written in C
- and works for all transports, and will be removed in the future.
+ and works for all transports; "git peek-remote" will be removed in
+ the future.
* From v1.6.0, the repack.usedeltabaseoffset config option will default
- to true, which will give denser packfile (i.e. more efficient storage).
+ to true, which will give denser packfiles (i.e. more efficient storage).
The downside is that git older than version 1.4.4 will not be able
to directly use a repository packed using this setting.
* gitk is now merged as a subdirectory of git.git project, in
preparation for its i18n.
- * progress display from many commands are a lot nicer to the eye.
+ * progress displays from many commands are a lot nicer to the eye.
Transfer commands show throughput data.
* many commands that pay attention to per-directory .gitignore now do
* Output processing for '--pretty=format:<user format>' has been
optimized.
- * Rename detection of diff family, while detecting exact matches, has
+ * Rename detection of diff family while detecting exact matches has
been greatly optimized.
- * Rename detection of diff family tries to make more naturally looking
- pairing. Earlier if more than one identical rename sources were
- found in the preimage, they were picked pretty much at random.
+ * Rename detection of diff family tries to make more natural looking
+ pairing. Earlier, if multiple identical rename sources were
+ found in the preimage, the source used was picked pretty much at random.
* Value "true" for color.diff and color.status configuration used to
mean "always" (even when the output is not going to a terminal).
* "git rebase --interactive" mode can now work on detached HEAD.
- * Other minor to serious bugs in "git rebase -i" has been fixed.
+ * Other minor to serious bugs in "git rebase -i" have been fixed.
* "git rebase" now detaches head during its operation, so after a
successful "git rebase" operation, the reflog entry branch@{1} for
* "git remote" learned "rm" subcommand.
- * "git cvsserver" can be run via "git shell".
+ * "git cvsserver" can be run via "git shell". Also, "cvs" is
+ recognized as a synonym for "git cvsserver", so that CVS users
+ can be switched to git just by changing their login shell.
* "git cvsserver" acts more like receive-pack by running post-receive
and post-update hooks.
* The format "git show" outputs an annotated tag has been updated to
include "Tagger: " and "Date: " lines from the tag itself. Strictly
speaking this is a backward incompatible change, but this is a
- reasonable usability fix and people's script shouldn't have been
+ reasonable usability fix and people's scripts shouldn't have been
relying on the exact output from "git show" Porcelain anyway.
* "git cvsexportcommit" learned -w option to specify and switch to the
makes copy-and-pasting for git-checkout/git-add/git-rm easier. The
traditional behaviour to show the full path relative to the top of
the work tree can be had by setting status.relativepaths
- configuration variable to true.
+ configuration variable to false.
* "git blame" kept text for each annotated revision in core needlessly;
this has been corrected.
--no-ext-diff::
Disallow external diff drivers.
+--src-prefix=<prefix>::
+ Show the given source prefix instead of "a/".
+
+--dst-prefix=<prefix>::
+ Show the given destination prefix instead of "b/".
+
+--no-prefix::
+ Do not show any source or destination prefix.
+
For more detailed explanation on these common options, see also
link:diffcore.html[diffcore documentation].
</li>\r
<li>\r
<p>\r
-<a href="git-prune.html">git-prune(1)</a> to remove unused objects in the repository.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-<a href="git-repack.html">git-repack(1)</a> to pack loose objects for efficiency.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
<a href="git-gc.html">git-gc(1)</a> to do common housekeeping tasks such as\r
repack and prune.\r
</p>\r
<div class="content">\r
<pre><tt>$ git fsck <b>(1)</b>\r
$ git count-objects <b>(2)</b>\r
-$ git repack <b>(3)</b>\r
-$ git gc <b>(4)</b></tt></pre>\r
+$ git gc <b>(3)</b></tt></pre>\r
</div></div>\r
<ol>\r
<li>\r
</li>\r
<li>\r
<p>\r
-without <tt>-a</tt> repacks incrementally. repacking every 4-5MB\r
-of loose objects accumulation may be a good rule of thumb.\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
-it is easier to use <tt>git gc</tt> than individual housekeeping commands\r
-such as <tt>prune</tt> and <tt>repack</tt>. This runs <tt>repack -a -d</tt>.\r
+repacks the local repository and performs other housekeeping tasks. Running\r
+without <tt>—prune</tt> is a safe operation even while other ones are in progress.\r
</p>\r
</li>\r
</ol>\r
<dd>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt>$ git repack -a -d <b>(1)</b>\r
-$ git prune</tt></pre>\r
+<pre><tt>$ git gc <b>(1)</b>\r
+$ git gc --prune</tt></pre>\r
</div></div>\r
<ol>\r
<li>\r
$ git log -p ORIG_HEAD.. arch/i386 include/asm-i386 <b>(4)</b>\r
$ git pull git://git.kernel.org/pub/.../jgarzik/libata-dev.git ALL <b>(5)</b>\r
$ git reset --hard ORIG_HEAD <b>(6)</b>\r
-$ git prune <b>(7)</b>\r
+$ git gc --prune <b>(7)</b>\r
$ git fetch --tags <b>(8)</b></tt></pre>\r
</div></div>\r
<ol>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 14-Nov-2007 12:12:04 UTC\r
+Last updated 21-Dec-2007 17:57:00 UTC\r
</div>\r
</div>\r
</body>\r
* gitlink:git-fsck[1] to check the repository for errors.
- * gitlink:git-prune[1] to remove unused objects in the repository.
-
- * gitlink:git-repack[1] to pack loose objects for efficiency.
-
* gitlink:git-gc[1] to do common housekeeping tasks such as
repack and prune.
------------
$ git fsck <1>
$ git count-objects <2>
-$ git repack <3>
-$ git gc <4>
+$ git gc <3>
------------
+
<1> running without `\--full` is usually cheap and assures the
repository health reasonably well.
<2> check how many loose objects there are and how much
disk space is wasted by not repacking.
-<3> without `-a` repacks incrementally. repacking every 4-5MB
-of loose objects accumulation may be a good rule of thumb.
-<4> it is easier to use `git gc` than individual housekeeping commands
-such as `prune` and `repack`. This runs `repack -a -d`.
+<3> repacks the local repository and performs other housekeeping tasks. Running
+without `--prune` is a safe operation even while other ones are in progress.
Repack a small project into single pack.::
+
------------
-$ git repack -a -d <1>
-$ git prune
+$ git gc <1>
+$ git gc --prune
------------
+
<1> pack all the objects reachable from the refs into one pack,
$ git log -p ORIG_HEAD.. arch/i386 include/asm-i386 <4>
$ git pull git://git.kernel.org/pub/.../jgarzik/libata-dev.git ALL <5>
$ git reset --hard ORIG_HEAD <6>
-$ git prune <7>
+$ git gc --prune <7>
$ git fetch --tags <8>
------------
+
Disallow external diff drivers.\r
</p>\r
</dd>\r
+<dt>\r
+--src-prefix=<prefix>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Show the given source prefix instead of "a/".\r
+</p>\r
+</dd>\r
+<dt>\r
+--dst-prefix=<prefix>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Show the given destination prefix instead of "b/".\r
+</p>\r
+</dd>\r
+<dt>\r
+--no-prefix\r
+</dt>\r
+<dd>\r
+<p>\r
+ Do not show any source or destination prefix.\r
+</p>\r
+</dd>\r
</dl>\r
<p>For more detailed explanation on these common options, see also\r
<a href="diffcore.html">diffcore documentation</a>.</p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:39:53 UTC\r
+Last updated 21-Dec-2007 17:56:56 UTC\r
</div>\r
</div>\r
</body>\r
Disallow external diff drivers.\r
</p>\r
</dd>\r
+<dt>\r
+--src-prefix=<prefix>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Show the given source prefix instead of "a/".\r
+</p>\r
+</dd>\r
+<dt>\r
+--dst-prefix=<prefix>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Show the given destination prefix instead of "b/".\r
+</p>\r
+</dd>\r
+<dt>\r
+--no-prefix\r
+</dt>\r
+<dd>\r
+<p>\r
+ Do not show any source or destination prefix.\r
+</p>\r
+</dd>\r
</dl>\r
<p>For more detailed explanation on these common options, see also\r
<a href="diffcore.html">diffcore documentation</a>.</p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:39:53 UTC\r
+Last updated 21-Dec-2007 17:56:56 UTC\r
</div>\r
</div>\r
</body>\r
Disallow external diff drivers.\r
</p>\r
</dd>\r
+<dt>\r
+--src-prefix=<prefix>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Show the given source prefix instead of "a/".\r
+</p>\r
+</dd>\r
+<dt>\r
+--dst-prefix=<prefix>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Show the given destination prefix instead of "b/".\r
+</p>\r
+</dd>\r
+<dt>\r
+--no-prefix\r
+</dt>\r
+<dd>\r
+<p>\r
+ Do not show any source or destination prefix.\r
+</p>\r
+</dd>\r
</dl>\r
<p>For more detailed explanation on these common options, see also\r
<a href="diffcore.html">diffcore documentation</a>.</p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:39:55 UTC\r
+Last updated 21-Dec-2007 17:56:57 UTC\r
</div>\r
</div>\r
</body>\r
Disallow external diff drivers.\r
</p>\r
</dd>\r
+<dt>\r
+--src-prefix=<prefix>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Show the given source prefix instead of "a/".\r
+</p>\r
+</dd>\r
+<dt>\r
+--dst-prefix=<prefix>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Show the given destination prefix instead of "b/".\r
+</p>\r
+</dd>\r
+<dt>\r
+--no-prefix\r
+</dt>\r
+<dd>\r
+<p>\r
+ Do not show any source or destination prefix.\r
+</p>\r
+</dd>\r
</dl>\r
<p>For more detailed explanation on these common options, see also\r
<a href="diffcore.html">diffcore documentation</a>.</p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:39:55 UTC\r
+Last updated 21-Dec-2007 17:56:58 UTC\r
</div>\r
</div>\r
</body>\r
Disallow external diff drivers.\r
</p>\r
</dd>\r
+<dt>\r
+--src-prefix=<prefix>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Show the given source prefix instead of "a/".\r
+</p>\r
+</dd>\r
+<dt>\r
+--dst-prefix=<prefix>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Show the given destination prefix instead of "b/".\r
+</p>\r
+</dd>\r
+<dt>\r
+--no-prefix\r
+</dt>\r
+<dd>\r
+<p>\r
+ Do not show any source or destination prefix.\r
+</p>\r
+</dd>\r
</dl>\r
<p>For more detailed explanation on these common options, see also\r
<a href="diffcore.html">diffcore documentation</a>.</p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:39:56 UTC\r
+Last updated 21-Dec-2007 17:56:59 UTC\r
</div>\r
</div>\r
</body>\r
Disallow external diff drivers.\r
</p>\r
</dd>\r
+<dt>\r
+--src-prefix=<prefix>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Show the given source prefix instead of "a/".\r
+</p>\r
+</dd>\r
+<dt>\r
+--dst-prefix=<prefix>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Show the given destination prefix instead of "b/".\r
+</p>\r
+</dd>\r
+<dt>\r
+--no-prefix\r
+</dt>\r
+<dd>\r
+<p>\r
+ Do not show any source or destination prefix.\r
+</p>\r
+</dd>\r
</dl>\r
<p>For more detailed explanation on these common options, see also\r
<a href="diffcore.html">diffcore documentation</a>.</p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Dec-2007 08:39:56 UTC\r
+Last updated 21-Dec-2007 17:56:59 UTC\r
</div>\r
</div>\r
</body>\r