helper script lost all its users and has been removed.
-Temporarily Disabled
+Temporarily disabled
--------------------
* "git http-push" is known not to work well with cURL library older
Deprecation notices
-------------------
- * 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:
+ * From v1.6.0, git 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 forms of git commands (e.g. "git-commit") from the
command line has been informally deprecated since early 2006, but
- 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.
+ Users are strongly encouraged to adjust their habits and scripts now
+ to prepare for this change.
* The post-receive hook was introduced in March 2007 to supersede
the post-update hook, primarily to overcome the command line length
* Comes with much improved gitk, with i18n.
- * Comes with "git gui" 0.9.1 with i18n.
+ * Comes with git-gui 0.9.2 with i18n.
* gitk is now merged as a subdirectory of git.git project, in
preparation for its i18n.
from its first parent.
* "git commit" used to unconditionally strip comment lines that
- began with '#' and removed excess blank lines. This
- behaviour has been made configurable.
+ began with '#' and removed excess blank lines. This behavior has
+ been made configurable.
* "git commit" has been rewritten in C.
* "git status" from a subdirectory now shows relative paths, which
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
+ traditional behavior to show the full path relative to the top of
the work tree can be had by setting status.relativepaths
configuration variable to false.
- enhancement and more use of the strbuf API.
+ * Makefile tweaks to support HP-UX is in.
Fixes since v1.5.3
------------------
--
exec >/var/tmp/1
-O=v1.5.4-rc4
+O=v1.5.4-rc5
echo O=`git describe refs/heads/master`
git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
fetches is a descendant of `<lbranch>`. This option
overrides that check.
+ifdef::git-pull[]
+\--no-tags::
+endif::git-pull[]
+ifndef::git-pull[]
-n, \--no-tags::
- By default, `git-fetch` fetches tags that point at
- objects that are downloaded from the remote repository
- and stores them locally. This option disables this
- automatic tag following.
+endif::git-pull[]
+ By default, tags that point at objects that are downloaded
+ from the remote repository are fetched and stored locally.
+ This option disables this automatic tag following.
-t, \--tags::
Most of the tags are fetched automatically as branch
</dt>\r
<dd>\r
<p>\r
- By default, <tt>git-fetch</tt> fetches tags that point at\r
- objects that are downloaded from the remote repository\r
- and stores them locally. This option disables this\r
- automatic tag following.\r
+ By default, tags that point at objects that are downloaded\r
+ from the remote repository are fetched and stored locally.\r
+ This option disables this automatic tag following.\r
</p>\r
</dd>\r
<dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:19 UTC\r
+Last updated 27-Jan-2008 08:23:28 UTC\r
</div>\r
</div>\r
</body>\r
head, <tt>git-merge-octopus</tt> otherwise).\r
</p>\r
</dd>\r
+</dl>\r
+<dl>\r
<dt>\r
-q, --quiet\r
</dt>\r
</p>\r
</dd>\r
<dt>\r
--n, --no-tags\r
+--no-tags\r
</dt>\r
<dd>\r
<p>\r
- By default, <tt>git-fetch</tt> fetches tags that point at\r
- objects that are downloaded from the remote repository\r
- and stores them locally. This option disables this\r
- automatic tag following.\r
+ By default, tags that point at objects that are downloaded\r
+ from the remote repository are fetched and stored locally.\r
+ This option disables this automatic tag following.\r
</p>\r
</dd>\r
<dt>\r
</dt>\r
<dd>\r
<p>\r
- Instead of a merge, perform a rebase after fetching.\r
- <strong>NOTE:</strong> This is a potentially _dangerous_ mode of operation.\r
- It rewrites history, which does not bode well when you\r
- published that history already. Do <strong>not</strong> use this option\r
- unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.\r
+ Instead of a merge, perform a rebase after fetching. If\r
+ there is a remote ref for the upstream branch, and this branch\r
+ was rebased since last fetched, the rebase uses that information\r
+ to avoid rebasing non-local changes.\r
</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>*NOTE:* This is a potentially _dangerous_ mode of operation.\r
+It rewrites history, which does not bode well when you\r
+published that history already. Do *not* use this option\r
+unless you have read linkgit:git-rebase[1] carefully.</tt></pre>\r
+</div></div>\r
</dd>\r
<dt>\r
--no-rebase\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:37 UTC\r
+Last updated 27-Jan-2008 08:23:28 UTC\r
</div>\r
</div>\r
</body>\r
-------
include::merge-options.txt[]
+:git-pull: 1
include::fetch-options.txt[]
include::pull-fetch-param.txt[]
include::merge-strategies.txt[]
\--rebase::
- Instead of a merge, perform a rebase after fetching.
+ Instead of a merge, perform a rebase after fetching. If
+ there is a remote ref for the upstream branch, and this branch
+ was rebased since last fetched, the rebase uses that information
+ to avoid rebasing non-local changes.
+
*NOTE:* This is a potentially _dangerous_ mode of operation.
It rewrites history, which does not bode well when you
published that history already. Do *not* use this option
Specify the primary recipient of the emails generated.\r
Generally, this will be the upstream maintainer of the\r
project involved.\r
+ Default is the value of the <em>sendemail.to</em> configuration value;\r
+ if that is unspecified, this will be prompted for.\r
</p>\r
<p>The --to option must be repeated for each user you want on the to list.</p>\r
</dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:46 UTC\r
+Last updated 27-Jan-2008 08:23:29 UTC\r
</div>\r
</div>\r
</body>\r
Specify the primary recipient of the emails generated.
Generally, this will be the upstream maintainer of the
project involved.
+ Default is the value of the 'sendemail.to' configuration value;
+ if that is unspecified, this will be prompted for.
+
The --to option must be repeated for each user you want on the to list.
<div class="content">\r
<pre><tt># Do the initial import on a server\r
ssh server "cd /pub && git-svn clone http://svn.foo.org/project\r
-# Clone locally\r
- git clone server:/pub/project\r
-# Tell git-svn which branch contains the Subversion commits\r
- git update-ref refs/remotes/git-svn origin/master\r
+# Clone locally - make sure the refs/remotes/ space matches the server\r
+ mkdir project\r
+ cd project\r
+ git-init\r
+ git remote add origin server:/pub/project\r
+ git config --add remote.origin.fetch=+refs/remotes/*:refs/remotes/*\r
+ git fetch\r
# Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server)\r
git-svn init http://svn.foo.org/project\r
# Pull the latest changes from Subversion\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:52 UTC\r
+Last updated 27-Jan-2008 08:23:29 UTC\r
</div>\r
</div>\r
</body>\r
------------------------------------------------------------------------
# Do the initial import on a server
ssh server "cd /pub && git-svn clone http://svn.foo.org/project
-# Clone locally
- git clone server:/pub/project
-# Tell git-svn which branch contains the Subversion commits
- git update-ref refs/remotes/git-svn origin/master
+# Clone locally - make sure the refs/remotes/ space matches the server
+ mkdir project
+ cd project
+ git-init
+ git remote add origin server:/pub/project
+ git config --add remote.origin.fetch=+refs/remotes/*:refs/remotes/*
+ git fetch
# Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server)
git-svn init http://svn.foo.org/project
# Pull the latest changes from Subversion
projects / git.git / commitdiff