Removal
-------
- * "git svnimport" was removed in favor of "git svn".
+ * "git svnimport" was removed in favor of "git svn". It is still there
+ in the source tree (contrib/examples) but unsupported.
Deprecation notices
* Comes with much improved gitk.
- * Comes with "git gui" 0.9.0 with i18n.
+ * Comes with "git gui" 0.9.1 with i18n.
+
+ * 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.
Transfer commands show throughput data.
pairing. Earlier if more than one identical rename sources were
found in the preimage, they were 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).
+ This has been corrected to mean the same thing as "auto".
+
+ * HTTP proxy can be specified per remote repository using
+ remote.*.httpproxy configuration, or global http.proxy configuration
+ variable.
+
+ * Various Perforce importer updates.
+
+ * Example update and post-receive hooks have been improved.
+
+ * Any command that wants to take a commit object name can now use
+ ":/string" syntax to name a commit.
+
* "git reset" is now built-in and its output can be squelched with -q.
* "git send-email" can optionally talk over ssmtp and use SMTP-AUTH.
--skip" without first running "git reset --hard", as the command now
runs it for you.
+ * "git rebase --interactive" mode can now work on detached HEAD.
+
+ * "git rebase" now detaches head during its operation, so after a
+ successful "git rebase" operation, the reflog entry branch@{1} for
+ the current branch points at the commit before the rebase was
+ started.
+
+ * "git rebase -i" also triggers rerere to help your repeated merges.
+
* "git merge" can call the "post-merge" hook.
* "git pack-objects" can optionally run deltification with multiple
than the usual one) after the user accumulates too many loose
objects.
+ * "git clean" has been rewritten in C.
+
* You need to explicitly set clean.requireForce to "false" to allow
"git clean" without -f to do any damage (lack of the configuration
variable used to mean "do not require -f option to lose untracked
files", but we now use the safer default).
- * "git clean" has been rewritten in C.
-
* "git push" learned --dry-run option to show what would happen if a
push is run.
one-to-one to the remote, and deletes refs from the remote that do
not exist anymore in the repository on the pushing side.
+ * "git push" can remove a corrupt ref at the remote site with the usual
+ ":ref" refspec.
+
* "git remote" knows --mirror mode. This is to set up configuration to
push into a remote repository to store local branch heads to the same
branch on the remote side, and remove branch heads locally removed
* "git remote" learned "rm" subcommand.
- * "git rebase --interactive" mode can now work on detached HEAD.
-
* "git cvsserver" can be run via "git shell".
* "git am" and "git rebase" are far less verbose.
* "git pull" learned to pass --[no-]ff option to underlying "git
merge".
- * Various Perforce importer updates.
+ * "git pull --rebase" is a different way to integrate what you fetched
+ into your current branch.
+
+ * "git fast-export" produces datastream that can be fed to fast-import
+ to reproduce the history recorded in a git repository.
+
+ * "git commit --allow-empty" allows you to create a single-parent
+ commit that records the same tree as its parent, overriding the usual
+ safety valve.
+
+ * "git commit --amend" can amend a merge that does not change the tree
+ from its first parent.
+
+ * "git stash random-text" does not create a new stash anymore. It was
+ a UI mistake. Use "git stash save random-text", or "git stash"
+ (without extra args) for that.
+
+ * "git prune --expire <time>" can exempt young loose objects from
+ getting pruned.
+
+ * "git branch --contains <commit>" can list branches that are
+ descendants of a given commit.
* "git log" learned --early-output option to help interactive GUI
implementations.
* "git ls-files" learned "--exclude-standard" to use the canned set of
exclude files.
- * "git rebase" now detaches head during its operation, so after a
- successful "git rebase" operation, the reflog entry branch@{1} for
- the current branch points at the commit before the rebase was
- started.
-
* "git tag -a -f existing" begins the editor session using the existing
annotation message.
* "git checkout" from and to detached HEAD leaves a bit more
information in the reflog.
- * "git branch" learned --contains option, to show only branches that
- can reach a given commit.
-
- * Example update and post-receive hooks have been improved.
-
- * "git push" can remove a corrupt ref at the remote site with the usual
- ":ref" refspec.
-
* In addition there are quite a few internal clean-ups. Notably
- many fork/exec have been replaced with run-command API,
--
exec >/var/tmp/1
-O=v1.5.3.7-966-g6bda21b
+O=v1.5.3.7-1003-gf38ca7c
echo O=`git describe refs/heads/master`
git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
gitlink:git-get-tar-commit-id[1]::
Extract commit ID from an archive created using git-archive.
+gitlink:git-help[1]::
+ display help information about git.
+
gitlink:git-instaweb[1]::
Instantly browse your working repository in gitweb.
gitlink:git-config[1]::
Get and set repository or global options.
+gitlink:git-fast-export[1]::
+ Git data exporter.
+
gitlink:git-fast-import[1]::
Backend for fast Git data importers.
is one of "ext" and "pserver") to make them apply only for the given
access method.
+http.proxy::
+ Override the HTTP proxy, normally configured using the 'http_proxy'
+ environment variable (see gitlink:curl[1]). This can be overridden
+ on a per-remote basis; see remote.<name>.proxy
+
http.sslVerify::
Whether to verify the SSL certificate when fetching or pushing
over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment
The URL of a remote repository. See gitlink:git-fetch[1] or
gitlink:git-push[1].
+remote.<name>.proxy::
+ For remotes that require curl (http, https and ftp), the URL to
+ the proxy to use for that remote. Set to the empty string to
+ disable proxying for that remote.
+
remote.<name>.fetch::
The default set of "refspec" for gitlink:git-fetch[1]. See
gitlink:git-fetch[1].
<dd>\r
<p>\r
Usually recording a commit that has the exact same tree as its\r
- sole parent commit and the command prevents you from making such\r
- a mistake. This option bypasses the safety, and is primarily\r
- for use by foreign scm interface scripts.\r
+ sole parent commit is a mistake, and the command prevents you\r
+ from making such a commit. This option bypasses the safety, and\r
+ is primarily for use by foreign scm interface scripts.\r
</p>\r
</dd>\r
<dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Dec-2007 09:57:28 UTC\r
+Last updated 04-Dec-2007 08:28:18 UTC\r
</div>\r
</div>\r
</body>\r
--allow-empty::
Usually recording a commit that has the exact same tree as its
- sole parent commit and the command prevents you from making such
- a mistake. This option bypasses the safety, and is primarily
- for use by foreign scm interface scripts.
+ sole parent commit is a mistake, and the command prevents you
+ from making such a commit. This option bypasses the safety, and
+ is primarily for use by foreign scm interface scripts.
-e|--edit::
The message taken from file with `-F`, command line with
access method.</p>\r
<dl>\r
<dt>\r
+http.proxy\r
+</dt>\r
+<dd>\r
+<p>\r
+ Override the HTTP proxy, normally configured using the <em>http_proxy</em>\r
+ environment variable (see <a href="curl.html">curl(1)</a>). This can be overridden\r
+ on a per-remote basis; see remote.<name>.proxy\r
+</p>\r
+</dd>\r
+<dt>\r
http.sslVerify\r
</dt>\r
<dd>\r
</p>\r
</dd>\r
<dt>\r
+remote.<name>.proxy\r
+</dt>\r
+<dd>\r
+<p>\r
+ For remotes that require curl (http, https and ftp), the URL to\r
+ the proxy to use for that remote. Set to the empty string to\r
+ disable proxying for that remote.\r
+</p>\r
+</dd>\r
+<dt>\r
remote.<name>.fetch\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Dec-2007 09:57:28 UTC\r
+Last updated 04-Dec-2007 08:28:18 UTC\r
</div>\r
</div>\r
</body>\r
</p>\r
</dd>\r
<dt>\r
---signed-tags=(ignore|warn|strip|abort)\r
+--signed-tags=(verbatim|warn|strip|abort)\r
</dt>\r
<dd>\r
<p>\r
</p>\r
<p>When asking to <em>abort</em> (which is the default), this program will die\r
when encountering a signed tag. With <em>strip</em>, the tags will be made\r
-unsigned, with <em>ignore</em>, they will be silently ignored (i.e. not exported)\r
+unsigned, with <em>verbatim</em>, they will be silently exported\r
and with <em>warn</em>, they will be exported, but you will see a warning.</p>\r
</dd>\r
</dl>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Dec-2007 09:57:29 UTC\r
+Last updated 04-Dec-2007 08:28:19 UTC\r
</div>\r
</div>\r
</body>\r
Insert 'progress' statements every <n> objects, to be shown by
gitlink:git-fast-import[1] during import.
---signed-tags=(ignore|warn|strip|abort)::
+--signed-tags=(verbatim|warn|strip|abort)::
Specify how to handle signed tags. Since any transformation
after the export can change the tag names (which can also happen
when excluding revisions) the signatures will not match.
+
When asking to 'abort' (which is the default), this program will die
when encountering a signed tag. With 'strip', the tags will be made
-unsigned, with 'ignore', they will be silently ignored (i.e. not exported)
+unsigned, with 'verbatim', they will be silently exported
and with 'warn', they will be exported, but you will see a warning.
--- /dev/null
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\r
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
+<head>\r
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<style type="text/css">\r
+/* Debug borders */\r
+p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
+/*\r
+ border: 1px solid red;\r
+*/\r
+}\r
+\r
+body {\r
+ margin: 1em 5% 1em 5%;\r
+}\r
+\r
+a { color: blue; }\r
+a:visited { color: fuchsia; }\r
+\r
+em {\r
+ font-style: italic;\r
+}\r
+\r
+strong {\r
+ font-weight: bold;\r
+}\r
+\r
+tt {\r
+ color: navy;\r
+}\r
+\r
+h1, h2, h3, h4, h5, h6 {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ margin-top: 1.2em;\r
+ margin-bottom: 0.5em;\r
+ line-height: 1.3;\r
+}\r
+\r
+h1 {\r
+ border-bottom: 2px solid silver;\r
+}\r
+h2 {\r
+ border-bottom: 2px solid silver;\r
+ padding-top: 0.5em;\r
+}\r
+\r
+div.sectionbody {\r
+ font-family: serif;\r
+ margin-left: 0;\r
+}\r
+\r
+hr {\r
+ border: 1px solid silver;\r
+}\r
+\r
+p {\r
+ margin-top: 0.5em;\r
+ margin-bottom: 0.5em;\r
+}\r
+\r
+pre {\r
+ padding: 0;\r
+ margin: 0;\r
+}\r
+\r
+span#author {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+ font-size: 1.2em;\r
+}\r
+span#email {\r
+}\r
+span#revision {\r
+ font-family: sans-serif;\r
+}\r
+\r
+div#footer {\r
+ font-family: sans-serif;\r
+ font-size: small;\r
+ border-top: 2px solid silver;\r
+ padding-top: 0.5em;\r
+ margin-top: 4.0em;\r
+}\r
+div#footer-text {\r
+ float: left;\r
+ padding-bottom: 0.5em;\r
+}\r
+div#footer-badges {\r
+ float: right;\r
+ padding-bottom: 0.5em;\r
+}\r
+\r
+div#preamble,\r
+div.tableblock, div.imageblock, div.exampleblock, div.verseblock,\r
+div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,\r
+div.admonitionblock {\r
+ margin-right: 10%;\r
+ margin-top: 1.5em;\r
+ margin-bottom: 1.5em;\r
+}\r
+div.admonitionblock {\r
+ margin-top: 2.5em;\r
+ margin-bottom: 2.5em;\r
+}\r
+\r
+div.content { /* Block element content. */\r
+ padding: 0;\r
+}\r
+\r
+/* Block element titles. */\r
+div.title, caption.title {\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+ text-align: left;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.5em;\r
+}\r
+div.title + * {\r
+ margin-top: 0;\r
+}\r
+\r
+td div.title:first-child {\r
+ margin-top: 0.0em;\r
+}\r
+div.content div.title:first-child {\r
+ margin-top: 0.0em;\r
+}\r
+div.content + div.title {\r
+ margin-top: 0.0em;\r
+}\r
+\r
+div.sidebarblock > div.content {\r
+ background: #ffffee;\r
+ border: 1px solid silver;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.listingblock > div.content {\r
+ border: 1px solid silver;\r
+ background: #f4f4f4;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.quoteblock > div.content {\r
+ padding-left: 2.0em;\r
+}\r
+div.quoteblock .attribution {\r
+ text-align: right;\r
+}\r
+\r
+div.admonitionblock .icon {\r
+ vertical-align: top;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ text-decoration: underline;\r
+ color: #527bbd;\r
+ padding-right: 0.5em;\r
+}\r
+div.admonitionblock td.content {\r
+ padding-left: 0.5em;\r
+ border-left: 2px solid silver;\r
+}\r
+\r
+div.exampleblock > div.content {\r
+ border-left: 2px solid silver;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.verseblock div.content {\r
+ white-space: pre;\r
+}\r
+\r
+div.imageblock div.content { padding-left: 0; }\r
+div.imageblock img { border: 1px solid silver; }\r
+span.image img { border-style: none; }\r
+\r
+dl {\r
+ margin-top: 0.8em;\r
+ margin-bottom: 0.8em;\r
+}\r
+dt {\r
+ margin-top: 0.5em;\r
+ margin-bottom: 0;\r
+ font-style: italic;\r
+}\r
+dd > *:first-child {\r
+ margin-top: 0;\r
+}\r
+\r
+ul, ol {\r
+ list-style-position: outside;\r
+}\r
+ol.olist2 {\r
+ list-style-type: lower-alpha;\r
+}\r
+\r
+div.tableblock > table {\r
+ border-color: #527bbd;\r
+ border-width: 3px;\r
+}\r
+thead {\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+}\r
+tfoot {\r
+ font-weight: bold;\r
+}\r
+\r
+div.hlist {\r
+ margin-top: 0.8em;\r
+ margin-bottom: 0.8em;\r
+}\r
+td.hlist1 {\r
+ vertical-align: top;\r
+ font-style: italic;\r
+ padding-right: 0.8em;\r
+}\r
+td.hlist2 {\r
+ vertical-align: top;\r
+}\r
+\r
+@media print {\r
+ div#footer-badges { display: none; }\r
+}\r
+include::./stylesheets/xhtml11-manpage.css[]\r
+/* Workarounds for IE6's broken and incomplete CSS2. */\r
+\r
+div.sidebar-content {\r
+ background: #ffffee;\r
+ border: 1px solid silver;\r
+ padding: 0.5em;\r
+}\r
+div.sidebar-title, div.image-title {\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+ margin-top: 0.0em;\r
+ margin-bottom: 0.5em;\r
+}\r
+\r
+div.listingblock div.content {\r
+ border: 1px solid silver;\r
+ background: #f4f4f4;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.quoteblock-content {\r
+ padding-left: 2.0em;\r
+}\r
+\r
+div.exampleblock-content {\r
+ border-left: 2px solid silver;\r
+ padding-left: 0.5em;\r
+}\r
+</style>\r
+<title>git-help(1)</title>\r
+</head>\r
+<body>\r
+<div id="header">\r
+<h1>\r
+git-help(1) Manual Page\r
+</h1>\r
+<h2>NAME</h2>\r
+<div class="sectionbody">\r
+<p>git-help -\r
+ display help information about git\r
+</p>\r
+</div>\r
+</div>\r
+<h2>SYNOPSIS</h2>\r
+<div class="sectionbody">\r
+<p><em>git help</em> [-a|--all] [COMMAND]</p>\r
+</div>\r
+<h2>DESCRIPTION</h2>\r
+<div class="sectionbody">\r
+<p>With no options and no COMMAND given, the synopsis of the <em>git</em>\r
+command and a list of the most commonly used git commands are printed\r
+on the standard output.</p>\r
+<p>If the option <em>--all</em> or <em>-a</em> is given, then all available commands are\r
+printed on the standard output.</p>\r
+<p>If a git command is named, a manual page for that command is brought\r
+up. The <em>man</em> program is used by default for this purpose.</p>\r
+<p>Note that <em>git --help …</em> is identical as <em>git help …</em> because the\r
+former is internally converted into the latter.</p>\r
+</div>\r
+<h2>OPTIONS</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+-a|--all\r
+</dt>\r
+<dd>\r
+<p>\r
+ Prints all the available commands on the standard output. This\r
+ option superseeds any other option.\r
+</p>\r
+</dd>\r
+</dl>\r
+</div>\r
+<h2>Author</h2>\r
+<div class="sectionbody">\r
+<p>Written by Junio C Hamano <gitster@pobox.com> and the git-list\r
+<git@vger.kernel.org>.</p>\r
+</div>\r
+<h2>Documentation</h2>\r
+<div class="sectionbody">\r
+<p>Initial documentation was part of the <a href="git.html">git(7)</a> man page.\r
+Christian Couder <chriscool@tuxfamily.org> extracted and rewrote it a\r
+little. Maintenance is done by the git-list <git@vger.kernel.org>.</p>\r
+</div>\r
+<h2>GIT</h2>\r
+<div class="sectionbody">\r
+<p>Part of the <a href="git.html">git(7)</a> suite</p>\r
+</div>\r
+<div id="footer">\r
+<div id="footer-text">\r
+Last updated 04-Dec-2007 08:29:49 UTC\r
+</div>\r
+</div>\r
+</body>\r
+</html>\r
--- /dev/null
+git-help(1)
+===========
+
+NAME
+----
+git-help - display help information about git
+
+SYNOPSIS
+--------
+'git help' [-a|--all] [COMMAND]
+
+DESCRIPTION
+-----------
+
+With no options and no COMMAND given, the synopsis of the 'git'
+command and a list of the most commonly used git commands are printed
+on the standard output.
+
+If the option '--all' or '-a' is given, then all available commands are
+printed on the standard output.
+
+If a git command is named, a manual page for that command is brought
+up. The 'man' program is used by default for this purpose.
+
+Note that 'git --help ...' is identical as 'git help ...' because the
+former is internally converted into the latter.
+
+OPTIONS
+-------
+-a|--all::
+
+ Prints all the available commands on the standard output. This
+ option superseeds any other option.
+
+Author
+------
+Written by Junio C Hamano <gitster@pobox.com> and the git-list
+<git@vger.kernel.org>.
+
+Documentation
+-------------
+Initial documentation was part of the gitlink:git[7] man page.
+Christian Couder <chriscool@tuxfamily.org> extracted and rewrote it a
+little. Maintenance is done by the git-list <git@vger.kernel.org>.
+
+GIT
+---
+Part of the gitlink:git[7] suite
<dd>\r
<p>\r
Prints the synopsis and a list of the most commonly used\r
- commands. If a git command is named this option will bring up\r
- the man-page for that command. If the option <em>--all</em> or <em>-a</em> is\r
- given then all available commands are printed.\r
+ commands. If the option <em>--all</em> or <em>-a</em> is given then all\r
+ available commands are printed. If a git command is named this\r
+ option will bring up the manual page for that command.\r
</p>\r
</dd>\r
<dt>\r
</p>\r
</dd>\r
<dt>\r
+<a href="git-fast-export.html">git-fast-export(1)</a>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Git data exporter.\r
+</p>\r
+</dd>\r
+<dt>\r
<a href="git-fast-import.html">git-fast-import(1)</a>\r
</dt>\r
<dd>\r
</p>\r
</dd>\r
<dt>\r
+<a href="git-help.html">git-help(1)</a>\r
+</dt>\r
+<dd>\r
+<p>\r
+ display help information about git.\r
+</p>\r
+</dd>\r
+<dt>\r
<a href="git-instaweb.html">git-instaweb(1)</a>\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Dec-2007 18:56:09 UTC\r
+Last updated 04-Dec-2007 08:28:20 UTC\r
</div>\r
</div>\r
</body>\r
--help::
Prints the synopsis and a list of the most commonly used
- commands. If a git command is named this option will bring up
- the man-page for that command. If the option '--all' or '-a' is
- given then all available commands are printed.
+ commands. If the option '--all' or '-a' is given then all
+ available commands are printed. If a git command is named this
+ option will bring up the manual page for that command.
--exec-path::
Path to wherever your core git programs are installed.
projects / git.git / commitdiff