Skip to content
Browse files

Autogenerated HTML docs for v1.8.3.2-701-g8c4e4ec

  • Loading branch information...
1 parent 1b5a382 commit a195230280e159899bd277641eb24efa7c6d1603 @gitster committed Jul 1, 2013
View
11 RelNotes/1.8.3.3.txt
@@ -0,0 +1,11 @@
+Git v1.8.3.3 Release Notes
+==========================
+
+Fixes since v1.8.3.2
+--------------------
+
+ * Mac OS X does not like to write(2) more than INT_MAX number of
+ bytes; work it around by chopping write(2) into smaller pieces.
+
+ * Newer MacOS X encourages the programs to compile and link with
+ their CommonCrypto, not with OpenSSL.
View
39 RelNotes/1.8.4.txt
@@ -35,6 +35,21 @@ Foreign interfaces, subsystems and ports.
UI, Workflows & Features
+ * Having multiple "fixup!" on a line in the rebase instruction sheet
+ did not work very well with "git rebase -i --autosquash".
+
+ * "git log" learned the "--author-date-order" option, with which the
+ output is topologically sorted and commits in parallel histories
+ are shown intermixed together based on the author timestamp.
+
+ * Various subcommands of "git submodule" refused to run from anywhere
+ other than the top of the working tree of the superproject, but
+ they have been taught to let you run from a subdirectory.
+
+ * "git diff" learned a mode that ignores hunks whose change consists
+ only of additions and removals of blank lines, which is the same as
+ "diff -B" (ignore blank lines) of GNU diff.
+
* "git rm" gives a single message followed by list of paths to report
multiple paths that cannot be removed.
@@ -108,6 +123,22 @@ UI, Workflows & Features
Performance, Internal Implementation, etc.
+ * The original way to specify remote repository using .git/branches/
+ used to have a nifty feature. The code to support the feature was
+ still in a function but the caller was changed not to call it 5
+ years ago, breaking that feature and leaving the supporting code
+ unreachable. The dead code has been removed.
+
+ * "git pack-refs" that races with new ref creation or deletion have
+ been susceptible to lossage of refs under right conditions, which
+ has been tightened up.
+
+ * We read loose and packed rerferences in two steps, but after
+ deciding to read a loose ref but before actually opening it to read
+ it, another process racing with us can unlink it, which would cause
+ us to barf. The codepath has been updated to retry when such a
+ race is detected, instead of outright failing.
+
* Uses of the platform fnmatch(3) function (many places in the code,
matching pathspec, .gitignore and .gitattributes to name a few)
have been replaced with wildmatch, allowing "foo/**/bar" that would
@@ -157,6 +188,14 @@ Unless otherwise noted, all the fixes since v1.8.3 in the maintenance
track are contained in this release (see release notes to them for
details).
+ * The configuration variable column.ui was poorly documented.
+ (merge 5e62cc1 rr/column-doc later to maint).
+
+ * "git name-rev --refs=tags/v*" were forbidden, which was a bit
+ inconvenient (you had to give a pattern to match refs fully, like
+ --refs=refs/tags/v*).
+ (merge 98c5c4a nk/name-rev-abbreviated-refs later to maint).
+
* "git apply" parsed patches that add new files, generated by
programs other than Git, incorrectly. This is an old breakage in
v1.7.11 and will need to be merged down to the maintanance tracks.
View
20 config.txt
@@ -934,26 +934,40 @@ column.ui::
This variable consists of a list of tokens separated by spaces
or commas:
+
+These options control when the feature should be enabled
+(defaults to 'never'):
++
--
`always`;;
always show in columns
`never`;;
never show in columns
`auto`;;
show in columns if the output is to the terminal
+--
++
+These options control layout (defaults to 'column'). Setting any
+of these implies 'always' if none of 'always', 'never', or 'auto' are
+specified.
++
+--
`column`;;
- fill columns before rows (default)
+ fill columns before rows
`row`;;
fill rows before columns
`plain`;;
show in one column
+--
++
+Finally, these options can be combined with a layout option (defaults
+to 'nodense'):
++
+--
`dense`;;
make unequal size columns to utilize more space
`nodense`;;
make equal size columns
--
-+
-This option defaults to 'never'.
column.branch::
Specify whether to output branch listing in `git branch` in columns.
View
3 diff-options.txt
@@ -461,6 +461,9 @@ endif::git-format-patch[]
differences even if one line has whitespace where the other
line has none.
+--ignore-blank-lines::
+ Ignore changes whose lines are all blank.
+
--inter-hunk-context=<lines>::
Show the context between diff hunks, up to the specified number
of lines, thereby fusing hunks that are close to each other.
View
6 git-am.html
@@ -1000,7 +1000,7 @@ <h2 id="_options">OPTIONS</h2>
<p>
When a patch failure occurs, &lt;msg&gt; will be printed
to the screen before exiting. This overrides the
- standard message informing you to use <code>--resolved</code>
+ standard message informing you to use <code>--continue</code>
or <code>--skip</code> to handle the failure. This is solely
for internal use between <em>git rebase</em> and <em>git am</em>.
</p>
@@ -1066,7 +1066,7 @@ <h2 id="_discussion">DISCUSSION</h2>
<p>
hand resolve the conflict in the working directory, and update
the index file to bring it into a state that the patch should
- have produced. Then run the command with the <em>--resolved</em> option.
+ have produced. Then run the command with the <em>--continue</em> option.
</p>
</li>
</ol></div>
@@ -1097,7 +1097,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-05-17 16:33:07 PDT
+Last updated 2013-07-01 14:29:27 PDT
</div>
</div>
</body>
View
4 git-am.txt
@@ -132,7 +132,7 @@ default. You can use `--no-utf8` to override this.
--resolvemsg=<msg>::
When a patch failure occurs, <msg> will be printed
to the screen before exiting. This overrides the
- standard message informing you to use `--resolved`
+ standard message informing you to use `--continue`
or `--skip` to handle the failure. This is solely
for internal use between 'git rebase' and 'git am'.
@@ -176,7 +176,7 @@ aborts in the middle. You can recover from this in one of two ways:
. hand resolve the conflict in the working directory, and update
the index file to bring it into a state that the patch should
- have produced. Then run the command with the '--resolved' option.
+ have produced. Then run the command with the '--continue' option.
The command refuses to process new mailboxes until the current
operation is finished, so if you decide to start over from scratch,
View
4 git-check-ignore.html
@@ -887,7 +887,7 @@ <h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="gitignore.html">gitignore(5)</a>
<a href="gitconfig.html">gitconfig(5)</a>
-<a href="git-ls-files.html">git-ls-files(5)</a></p></div>
+<a href="git-ls-files.html">git-ls-files(1)</a></p></div>
</div>
</div>
<div class="sect1">
@@ -900,7 +900,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-05-29 16:56:14 PDT
+Last updated 2013-07-01 14:29:27 PDT
</div>
</div>
</body>
View
2 git-check-ignore.txt
@@ -102,7 +102,7 @@ SEE ALSO
--------
linkgit:gitignore[5]
linkgit:gitconfig[5]
-linkgit:git-ls-files[5]
+linkgit:git-ls-files[1]
GIT
---
View
26 git-clone.html
@@ -1102,6 +1102,8 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
and ftps can be used for fetching and rsync can be used for fetching
and pushing, but these are inefficient and deprecated; do not use
them).</p></div>
+<div class="paragraph"><p>The native transport (i.e. git:// URL) does no authentication and
+should be used with caution on unsecured networks.</p></div>
<div class="paragraph"><p>The following syntaxes may be used with them:</p></div>
<div class="ulist"><ul>
<li>
@@ -1237,8 +1239,8 @@ <h2 id="_examples">Examples</h2>
</p>
<div class="listingblock">
<div class="content">
-<pre><code>$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
-$ cd my2.6
+<pre><code>$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux
+$ cd my-linux
$ make</code></pre>
</div></div>
</li>
@@ -1259,10 +1261,10 @@ <h2 id="_examples">Examples</h2>
</p>
<div class="listingblock">
<div class="content">
-<pre><code>$ git clone --reference my2.6 \
- git://git.kernel.org/pub/scm/.../linux-2.7 \
- my2.7
-$ cd my2.7</code></pre>
+<pre><code>$ git clone --reference /git/linux.git \
+ git://git.kernel.org/pub/scm/.../linux.git \
+ my-linux
+$ cd my-linux</code></pre>
</div></div>
</li>
<li>
@@ -1274,16 +1276,6 @@ <h2 id="_examples">Examples</h2>
<pre><code>$ git clone --bare -l /home/proj/.git /pub/scm/proj.git</code></pre>
</div></div>
</li>
-<li>
-<p>
-Create a repository on the kernel.org machine that borrows from Linus:
-</p>
-<div class="listingblock">
-<div class="content">
-<pre><code>$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \
- /pub/scm/.../me/subsys-2.6.git</code></pre>
-</div></div>
-</li>
</ul></div>
</div>
</div>
@@ -1297,7 +1289,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-05-17 16:33:07 PDT
+Last updated 2013-07-01 14:29:27 PDT
</div>
</div>
</body>
View
19 git-clone.txt
@@ -239,8 +239,8 @@ Examples
* Clone from upstream:
+
------------
-$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
-$ cd my2.6
+$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux
+$ cd my-linux
$ make
------------
@@ -257,10 +257,10 @@ $ git show-branch
* Clone from upstream while borrowing from an existing local directory:
+
------------
-$ git clone --reference my2.6 \
- git://git.kernel.org/pub/scm/.../linux-2.7 \
- my2.7
-$ cd my2.7
+$ git clone --reference /git/linux.git \
+ git://git.kernel.org/pub/scm/.../linux.git \
+ my-linux
+$ cd my-linux
------------
@@ -271,13 +271,6 @@ $ git clone --bare -l /home/proj/.git /pub/scm/proj.git
------------
-* Create a repository on the kernel.org machine that borrows from Linus:
-+
-------------
-$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \
- /pub/scm/.../me/subsys-2.6.git
-------------
-
GIT
---
Part of the linkgit:git[1] suite
View
20 git-config.html
@@ -2703,6 +2703,8 @@ <h3 id="_variables">Variables</h3>
This variable consists of a list of tokens separated by spaces
or commas:
</p>
+<div class="paragraph"><p>These options control when the feature should be enabled
+(defaults to <em>never</em>):</p></div>
<div class="openblock">
<div class="content">
<div class="dlist"><dl>
@@ -2730,12 +2732,20 @@ <h3 id="_variables">Variables</h3>
show in columns if the output is to the terminal
</p>
</dd>
+</dl></div>
+</div></div>
+<div class="paragraph"><p>These options control layout (defaults to <em>column</em>). Setting any
+of these implies <em>always</em> if none of <em>always</em>, <em>never</em>, or <em>auto</em> are
+specified.</p></div>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
<dt class="hdlist1">
<code>column</code>
</dt>
<dd>
<p>
- fill columns before rows (default)
+ fill columns before rows
</p>
</dd>
<dt class="hdlist1">
@@ -2754,6 +2764,13 @@ <h3 id="_variables">Variables</h3>
show in one column
</p>
</dd>
+</dl></div>
+</div></div>
+<div class="paragraph"><p>Finally, these options can be combined with a layout option (defaults
+to <em>nodense</em>):</p></div>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
<dt class="hdlist1">
<code>dense</code>
</dt>
@@ -2772,7 +2789,6 @@ <h3 id="_variables">Variables</h3>
</dd>
</dl></div>
</div></div>
-<div class="paragraph"><p>This option defaults to <em>never</em>.</p></div>
</dd>
<dt class="hdlist1">
column.branch
View
8 git-diff-files.html
@@ -1487,6 +1487,14 @@ <h2 id="_options">OPTIONS</h2>
</p>
</dd>
<dt class="hdlist1">
+--ignore-blank-lines
+</dt>
+<dd>
+<p>
+ Ignore changes whose lines are all blank.
+</p>
+</dd>
+<dt class="hdlist1">
--inter-hunk-context=&lt;lines&gt;
</dt>
<dd>
View
8 git-diff-index.html
@@ -1488,6 +1488,14 @@ <h2 id="_options">OPTIONS</h2>
</p>
</dd>
<dt class="hdlist1">
+--ignore-blank-lines
+</dt>
+<dd>
+<p>
+ Ignore changes whose lines are all blank.
+</p>
+</dd>
+<dt class="hdlist1">
--inter-hunk-context=&lt;lines&gt;
</dt>
<dd>
View
8 git-diff-tree.html
@@ -1489,6 +1489,14 @@ <h2 id="_options">OPTIONS</h2>
</p>
</dd>
<dt class="hdlist1">
+--ignore-blank-lines
+</dt>
+<dd>
+<p>
+ Ignore changes whose lines are all blank.
+</p>
+</dd>
+<dt class="hdlist1">
--inter-hunk-context=&lt;lines&gt;
</dt>
<dd>
View
8 git-diff.html
@@ -1588,6 +1588,14 @@ <h2 id="_options">OPTIONS</h2>
</p>
</dd>
<dt class="hdlist1">
+--ignore-blank-lines
+</dt>
+<dd>
+<p>
+ Ignore changes whose lines are all blank.
+</p>
+</dd>
+<dt class="hdlist1">
--inter-hunk-context=&lt;lines&gt;
</dt>
<dd>
View
4 git-fast-export.html
@@ -937,7 +937,7 @@ <h2 id="_examples">EXAMPLES</h2>
<h2 id="_limitations">Limitations</h2>
<div class="sectionbody">
<div class="paragraph"><p>Since <em>git fast-import</em> cannot tag trees, you will not be
-able to export the linux-2.6.git repository completely, as it contains
+able to export the linux.git repository completely, as it contains
a tag referencing a tree instead of a commit.</p></div>
</div>
</div>
@@ -951,7 +951,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-05-17 16:33:07 PDT
+Last updated 2013-07-01 14:29:27 PDT
</div>
</div>
</body>
View
2 git-fast-export.txt
@@ -141,7 +141,7 @@ Limitations
-----------
Since 'git fast-import' cannot tag trees, you will not be
-able to export the linux-2.6.git repository completely, as it contains
+able to export the linux.git repository completely, as it contains
a tag referencing a tree instead of a commit.
GIT
View
2 git-fetch.html
@@ -1137,6 +1137,8 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
and ftps can be used for fetching and rsync can be used for fetching
and pushing, but these are inefficient and deprecated; do not use
them).</p></div>
+<div class="paragraph"><p>The native transport (i.e. git:// URL) does no authentication and
+should be used with caution on unsecured networks.</p></div>
<div class="paragraph"><p>The following syntaxes may be used with them:</p></div>
<div class="ulist"><ul>
<li>
View
8 git-format-patch.html
@@ -1249,6 +1249,14 @@ <h2 id="_options">OPTIONS</h2>
</p>
</dd>
<dt class="hdlist1">
+--ignore-blank-lines
+</dt>
+<dd>
+<p>
+ Ignore changes whose lines are all blank.
+</p>
+</dd>
+<dt class="hdlist1">
--inter-hunk-context=&lt;lines&gt;
</dt>
<dd>
View
17 git-log.html
@@ -1712,6 +1712,15 @@ <h3 id="_commit_ordering">Commit Ordering</h3>
</p>
</dd>
<dt class="hdlist1">
+--author-date-order
+</dt>
+<dd>
+<p>
+ Show no parents before all of its children are shown, but
+ otherwise show commits in the author timestamp order.
+</p>
+</dd>
+<dt class="hdlist1">
--topo-order
</dt>
<dd>
@@ -3331,6 +3340,14 @@ <h2 id="_common_diff_options">Common diff options</h2>
</p>
</dd>
<dt class="hdlist1">
+--ignore-blank-lines
+</dt>
+<dd>
+<p>
+ Ignore changes whose lines are all blank.
+</p>
+</dd>
+<dt class="hdlist1">
--inter-hunk-context=&lt;lines&gt;
</dt>
<dd>
View
13 git-ls-remote.html
@@ -823,9 +823,9 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Location of the repository. The shorthand defined in
- $GIT_DIR/branches/ can be used. Use "." (dot) to list references in
- the local repository.
+ The "remote" repository to query. This parameter can be
+ either a URL or the name of a remote (see the GIT URLS and
+ REMOTES sections of <a href="git-fetch.html">git-fetch(1)</a>).
</p>
</dd>
<dt class="hdlist1">
@@ -856,9 +856,8 @@ <h2 id="_examples">EXAMPLES</h2>
$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc
5fe978a5381f1fbad26a80e682ddd2a401966740 refs/heads/master
c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/pu
-b1d096f2926c4e37c9c0b6a7bf2119bedaa277cb refs/heads/rc
-$ echo http://www.kernel.org/pub/scm/git/git.git &gt;.git/branches/public
-$ git ls-remote --tags public v\*
+$ git remote add korg http://www.kernel.org/pub/scm/git/git.git
+$ git ls-remote --tags korg v\*
d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99
f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tags/v0.99.1
c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2
@@ -876,7 +875,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-09-14 13:10:46 PDT
+Last updated 2013-07-01 14:29:27 PDT
</div>
</div>
</body>
View
11 git-ls-remote.txt
@@ -48,9 +48,9 @@ OPTIONS
exit without talking to the remote.
<repository>::
- Location of the repository. The shorthand defined in
- $GIT_DIR/branches/ can be used. Use "." (dot) to list references in
- the local repository.
+ The "remote" repository to query. This parameter can be
+ either a URL or the name of a remote (see the GIT URLS and
+ REMOTES sections of linkgit:git-fetch[1]).
<refs>...::
When unspecified, all references, after filtering done
@@ -70,9 +70,8 @@ EXAMPLES
$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc
5fe978a5381f1fbad26a80e682ddd2a401966740 refs/heads/master
c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/pu
- b1d096f2926c4e37c9c0b6a7bf2119bedaa277cb refs/heads/rc
- $ echo http://www.kernel.org/pub/scm/git/git.git >.git/branches/public
- $ git ls-remote --tags public v\*
+ $ git remote add korg http://www.kernel.org/pub/scm/git/git.git
+ $ git ls-remote --tags korg v\*
d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99
f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tags/v0.99.1
c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2
View
5 git-name-rev.html
@@ -776,7 +776,8 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Only use refs whose names match a given shell pattern.
+ Only use refs whose names match a given shell pattern. The pattern
+ can be one of branch name, tag name or fully qualified ref name.
</p>
</dd>
<dt class="hdlist1">
@@ -858,7 +859,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PST
+Last updated 2013-07-01 14:29:27 PDT
</div>
</div>
</body>
View
3 git-name-rev.txt
@@ -25,7 +25,8 @@ OPTIONS
Do not use branch names, but only tags to name the commits
--refs=<pattern>::
- Only use refs whose names match a given shell pattern.
+ Only use refs whose names match a given shell pattern. The pattern
+ can be one of branch name, tag name or fully qualified ref name.
--all::
List all commits reachable from all refs
View
2 git-pull.html
@@ -1333,6 +1333,8 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
and ftps can be used for fetching and rsync can be used for fetching
and pushing, but these are inefficient and deprecated; do not use
them).</p></div>
+<div class="paragraph"><p>The native transport (i.e. git:// URL) does no authentication and
+should be used with caution on unsecured networks.</p></div>
<div class="paragraph"><p>The following syntaxes may be used with them:</p></div>
<div class="ulist"><ul>
<li>
View
2 git-push.html
@@ -1067,6 +1067,8 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
and ftps can be used for fetching and rsync can be used for fetching
and pushing, but these are inefficient and deprecated; do not use
them).</p></div>
+<div class="paragraph"><p>The native transport (i.e. git:// URL) does no authentication and
+should be used with caution on unsecured networks.</p></div>
<div class="paragraph"><p>The following syntaxes may be used with them:</p></div>
<div class="ulist"><ul>
<li>
View
6 git-rebase.html
@@ -1284,7 +1284,9 @@ <h2 id="_options">OPTIONS</h2>
the same &#8230;, automatically modify the todo list of rebase -i
so that the commit marked for squashing comes right after the
commit to be modified, and change the action of the moved
- commit from <code>pick</code> to <code>squash</code> (or <code>fixup</code>).
+ commit from <code>pick</code> to <code>squash</code> (or <code>fixup</code>). Ignores subsequent
+ "fixup! " or "squash! " after the first, in case you referred to an
+ earlier fixup/squash with <code>git commit --fixup/--squash</code>.
</p>
<div class="paragraph"><p>This option is only valid when the <em>--interactive</em> option is used.</p></div>
<div class="paragraph"><p>If the <em>--autosquash</em> option is enabled by default using the
@@ -1932,7 +1934,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-06-11 15:22:06 PDT
+Last updated 2013-07-01 14:29:27 PDT
</div>
</div>
</body>
View
4 git-rebase.txt
@@ -389,7 +389,9 @@ squash/fixup series.
the same ..., automatically modify the todo list of rebase -i
so that the commit marked for squashing comes right after the
commit to be modified, and change the action of the moved
- commit from `pick` to `squash` (or `fixup`).
+ commit from `pick` to `squash` (or `fixup`). Ignores subsequent
+ "fixup! " or "squash! " after the first, in case you referred to an
+ earlier fixup/squash with `git commit --fixup/--squash`.
+
This option is only valid when the '--interactive' option is used.
+
View
27 git-remote.html
@@ -962,18 +962,25 @@ <h2 id="_examples">Examples</h2>
<pre><code>$ git remote
origin
$ git branch -r
-origin/master
-$ git remote add linux-nfs git://linux-nfs.org/pub/linux/nfs-2.6.git
+ origin/HEAD -&gt; origin/master
+ origin/master
+$ git remote add staging git://git.kernel.org/.../gregkh/staging.git
$ git remote
-linux-nfs
origin
-$ git fetch
-* refs/remotes/linux-nfs/master: storing branch 'master' ...
- commit: bf81b46
+staging
+$ git fetch staging
+...
+From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
+ * [new branch] master -&gt; staging/master
+ * [new branch] staging-linus -&gt; staging/staging-linus
+ * [new branch] staging-next -&gt; staging/staging-next
$ git branch -r
-origin/master
-linux-nfs/master
-$ git checkout -b nfs linux-nfs/master
+ origin/HEAD -&gt; origin/master
+ origin/master
+ staging/master
+ staging/staging-linus
+ staging/staging-next
+$ git checkout -b staging staging/master
...</code></pre>
</div></div>
</li>
@@ -1011,7 +1018,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-05-17 16:33:07 PDT
+Last updated 2013-07-01 14:29:27 PDT
</div>
</div>
</body>
View
25 git-remote.txt
@@ -187,18 +187,25 @@ Examples
$ git remote
origin
$ git branch -r
-origin/master
-$ git remote add linux-nfs git://linux-nfs.org/pub/linux/nfs-2.6.git
+ origin/HEAD -> origin/master
+ origin/master
+$ git remote add staging git://git.kernel.org/.../gregkh/staging.git
$ git remote
-linux-nfs
origin
-$ git fetch
-* refs/remotes/linux-nfs/master: storing branch 'master' ...
- commit: bf81b46
+staging
+$ git fetch staging
+...
+From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
+ * [new branch] master -> staging/master
+ * [new branch] staging-linus -> staging/staging-linus
+ * [new branch] staging-next -> staging/staging-next
$ git branch -r
-origin/master
-linux-nfs/master
-$ git checkout -b nfs linux-nfs/master
+ origin/HEAD -> origin/master
+ origin/master
+ staging/master
+ staging/staging-linus
+ staging/staging-next
+$ git checkout -b staging staging/master
...
------------
View
9 git-rev-list.html
@@ -1728,6 +1728,15 @@ <h3 id="_commit_ordering">Commit Ordering</h3>
</p>
</dd>
<dt class="hdlist1">
+--author-date-order
+</dt>
+<dd>
+<p>
+ Show no parents before all of its children are shown, but
+ otherwise show commits in the author timestamp order.
+</p>
+</dd>
+<dt class="hdlist1">
--topo-order
</dt>
<dd>
View
22 git-rev-parse.html
@@ -847,6 +847,26 @@ <h2 id="_options">OPTIONS</h2>
</p>
</dd>
<dt class="hdlist1">
+--prefix &lt;arg&gt;
+</dt>
+<dd>
+<p>
+ Behave as if <em>git rev-parse</em> was invoked from the <code>&lt;arg&gt;</code>
+ subdirectory of the working tree. Any relative filenames are
+ resolved as if they are prefixed by <code>&lt;arg&gt;</code> and will be printed
+ in that form.
+</p>
+<div class="paragraph"><p>This can be used to convert arguments to a command run in a subdirectory
+so that they can still be used after moving to the top-level of the
+repository. For example:</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><code>prefix=$(git rev-parse --show-prefix)
+cd "$(git rev-parse --show-toplevel)"
+eval "set -- $(git rev-parse --sq --prefix "$prefix" "$@")"</code></pre>
+</div></div>
+</dd>
+<dt class="hdlist1">
--verify
</dt>
<dd>
@@ -1704,7 +1724,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-04-21 19:25:38 PDT
+Last updated 2013-07-01 14:29:27 PDT
</div>
</div>
</body>
View
16 git-rev-parse.txt
@@ -59,6 +59,22 @@ OPTIONS
If there is no parameter given by the user, use `<arg>`
instead.
+--prefix <arg>::
+ Behave as if 'git rev-parse' was invoked from the `<arg>`
+ subdirectory of the working tree. Any relative filenames are
+ resolved as if they are prefixed by `<arg>` and will be printed
+ in that form.
++
+This can be used to convert arguments to a command run in a subdirectory
+so that they can still be used after moving to the top-level of the
+repository. For example:
++
+----
+prefix=$(git rev-parse --show-prefix)
+cd "$(git rev-parse --show-toplevel)"
+eval "set -- $(git rev-parse --sq --prefix "$prefix" "$@")"
+----
+
--verify::
Verify that exactly one parameter is provided, and that it
can be turned into a raw 20-byte SHA-1 that can be used to
View
4 rev-list-options.txt
@@ -625,6 +625,10 @@ By default, the commits are shown in reverse chronological order.
Show no parents before all of its children are shown, but
otherwise show commits in the commit timestamp order.
+--author-date-order::
+ Show no parents before all of its children are shown, but
+ otherwise show commits in the author timestamp order.
+
--topo-order::
Show no parents before all of its children are shown, and
avoid showing commits on multiple lines of history
View
8 technical/racy-git.html
@@ -873,9 +873,9 @@ <h2 id="_runtime_penalty">Runtime penalty</h2>
$ git ls-files | git update-index --stdin
$ touch -r .datestamp .git/index</code></pre>
</div></div>
-<div class="paragraph"><p>This will make all index entries racily clean. The linux-2.6
-project, for example, there are over 20,000 files in the working
-tree. On my Athlon 64 X2 3800+, after the above:</p></div>
+<div class="paragraph"><p>This will make all index entries racily clean. The linux project, for
+example, there are over 20,000 files in the working tree. On my
+Athlon 64 X2 3800+, after the above:</p></div>
<div class="literalblock">
<div class="content">
<pre><code>$ /usr/bin/time git diff-files
@@ -944,7 +944,7 @@ <h2 id="_avoiding_runtime_penalty">Avoiding runtime penalty</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-07-01 14:29:27 PDT
</div>
</div>
</body>
View
6 technical/racy-git.txt
@@ -135,9 +135,9 @@ them, and give the same timestamp to the index file:
$ git ls-files | git update-index --stdin
$ touch -r .datestamp .git/index
-This will make all index entries racily clean. The linux-2.6
-project, for example, there are over 20,000 files in the working
-tree. On my Athlon 64 X2 3800+, after the above:
+This will make all index entries racily clean. The linux project, for
+example, there are over 20,000 files in the working tree. On my
+Athlon 64 X2 3800+, after the above:
$ /usr/bin/time git diff-files
1.68user 0.54system 0:02.22elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
View
3 urls.txt
@@ -11,6 +11,9 @@ and ftps can be used for fetching and rsync can be used for fetching
and pushing, but these are inefficient and deprecated; do not use
them).
+The native transport (i.e. git:// URL) does no authentication and
+should be used with caution on unsecured networks.
+
The following syntaxes may be used with them:
- ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/path/to/repo.git/
View
36 user-manual.html
@@ -16,8 +16,8 @@
$ git clone git://git.kernel.org/pub/scm/git/git.git
# the Linux kernel (approx. 640MB download):
$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git</pre><p>The initial clone may be time-consuming for a large project, but you
-will only need to clone once.</p><p>The clone command creates a new directory named after the project (<code class="literal">git</code>
-or <code class="literal">linux-2.6</code> in the examples above). After you cd into this
+will only need to clone once.</p><p>The clone command creates a new directory named after the project
+(<code class="literal">git</code> or <code class="literal">linux</code> in the examples above). After you cd into this
directory, you will see that it contains a copy of the project files,
called the <a class="link" href="#def_working_tree">working tree</a>, together with a special
top-level directory named <code class="literal">.git</code>, which contains all the information
@@ -218,19 +218,25 @@
remote-tracking branches to the latest version found in her
repository. It will not touch any of your own branches—not even the
"master" branch that was created for you on clone.</p></div><div class="section" title="Fetching branches from other repositories"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="fetching-branches"></a>Fetching branches from other repositories</h2></div></div></div><p>You can also track branches from repositories other than the one you
-cloned from, using <a class="ulink" href="git-remote.html" target="_top">git-remote(1)</a>:</p><pre class="literallayout">$ git remote add linux-nfs git://linux-nfs.org/pub/nfs-2.6.git
-$ git fetch linux-nfs
-* refs/remotes/linux-nfs/master: storing branch 'master' ...
- commit: bf81b46</pre><p>New remote-tracking branches will be stored under the shorthand name
-that you gave <code class="literal">git remote add</code>, in this case <code class="literal">linux-nfs</code>:</p><pre class="literallayout">$ git branch -r
-linux-nfs/master
-origin/master</pre><p>If you run <code class="literal">git fetch &lt;remote&gt;</code> later, the remote-tracking branches
+cloned from, using <a class="ulink" href="git-remote.html" target="_top">git-remote(1)</a>:</p><pre class="literallayout">$ git remote add staging git://git.kernel.org/.../gregkh/staging.git
+$ git fetch staging
+...
+From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
+ * [new branch] master -&gt; staging/master
+ * [new branch] staging-linus -&gt; staging/staging-linus
+ * [new branch] staging-next -&gt; staging/staging-next</pre><p>New remote-tracking branches will be stored under the shorthand name
+that you gave <code class="literal">git remote add</code>, in this case <code class="literal">staging</code>:</p><pre class="literallayout">$ git branch -r
+ origin/HEAD -&gt; origin/master
+ origin/master
+ staging/master
+ staging/staging-linus
+ staging/staging-next</pre><p>If you run <code class="literal">git fetch &lt;remote&gt;</code> later, the remote-tracking branches
for the named <code class="literal">&lt;remote&gt;</code> will be updated.</p><p>If you examine the file <code class="literal">.git/config</code>, you will see that Git has added
a new stanza:</p><pre class="literallayout">$ cat .git/config
...
-[remote "linux-nfs"]
- url = git://linux-nfs.org/pub/nfs-2.6.git
- fetch = +refs/heads/*:refs/remotes/linux-nfs/*
+[remote "staging"]
+ url = git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
+ fetch = +refs/heads/*:refs/remotes/staging/*
...</pre><p>This is what causes Git to track the remote’s branches; you may modify
or delete these configuration options by editing <code class="literal">.git/config</code> with a
text editor. (See the "CONFIGURATION FILE" section of
@@ -729,7 +735,7 @@
"<a class="link" href="#resolving-a-merge" title="Resolving a merge">Resolving a merge</a>". (The <code class="literal">-3</code> option tells
Git to perform a merge; if you would prefer it just to abort and
leave your tree and index untouched, you may omit that option.)</p><p>Once the index is updated with the results of the conflict
-resolution, instead of creating a new commit, just run</p><pre class="literallayout">$ git am --resolved</pre><p>and Git will create the commit for you and continue applying the
+resolution, instead of creating a new commit, just run</p><pre class="literallayout">$ git am --continue</pre><p>and Git will create the commit for you and continue applying the
remaining patches from the mailbox.</p><p>The final result will be a series of commits, one for each patch in
the original mailbox, with authorship and commit log message each
taken from the message containing each patch.</p></div><div class="section" title="Public Git repositories"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="public-repositories"></a>Public Git repositories</h2></div></div></div><p>Another way to submit changes to a project is to tell the maintainer
@@ -866,7 +872,7 @@
him a "please pull" request.)
</li></ul></div><p>He also uses a set of temporary branches ("topic branches"), each
containing a logical grouping of patches.</p><p>To set this up, first create your work tree by cloning Linus’s public
-tree:</p><pre class="literallayout">$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git work
+tree:</p><pre class="literallayout">$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git work
$ cd work</pre><p>Linus’s tree will be stored in the remote-tracking branch named origin/master,
and can be updated using <a class="ulink" href="git-fetch.html" target="_top">git-fetch(1)</a>; you can track other
public trees using <a class="ulink" href="git-remote.html" target="_top">git-remote(1)</a> to set up a "remote" and
@@ -886,7 +892,7 @@
make it easy to push both branches to your public tree. (See
<a class="xref" href="#setting-up-a-public-repository" title="Setting up a public repository">the section called “Setting up a public repository”</a>.)</p><pre class="literallayout">$ cat &gt;&gt; .git/config &lt;&lt;EOF
[remote "mytree"]
- url = master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git
+ url = master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux.git
push = release
push = test
EOF</pre><p>Then you can push both the test and release trees using
View
36 user-manual.txt
@@ -66,8 +66,8 @@ $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
The initial clone may be time-consuming for a large project, but you
will only need to clone once.
-The clone command creates a new directory named after the project (`git`
-or `linux-2.6` in the examples above). After you cd into this
+The clone command creates a new directory named after the project
+(`git` or `linux` in the examples above). After you cd into this
directory, you will see that it contains a copy of the project files,
called the <<def_working_tree,working tree>>, together with a special
top-level directory named `.git`, which contains all the information
@@ -431,19 +431,25 @@ You can also track branches from repositories other than the one you
cloned from, using linkgit:git-remote[1]:
-------------------------------------------------
-$ git remote add linux-nfs git://linux-nfs.org/pub/nfs-2.6.git
-$ git fetch linux-nfs
-* refs/remotes/linux-nfs/master: storing branch 'master' ...
- commit: bf81b46
+$ git remote add staging git://git.kernel.org/.../gregkh/staging.git
+$ git fetch staging
+...
+From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
+ * [new branch] master -> staging/master
+ * [new branch] staging-linus -> staging/staging-linus
+ * [new branch] staging-next -> staging/staging-next
-------------------------------------------------
New remote-tracking branches will be stored under the shorthand name
-that you gave `git remote add`, in this case `linux-nfs`:
+that you gave `git remote add`, in this case `staging`:
-------------------------------------------------
$ git branch -r
-linux-nfs/master
-origin/master
+ origin/HEAD -> origin/master
+ origin/master
+ staging/master
+ staging/staging-linus
+ staging/staging-next
-------------------------------------------------
If you run `git fetch <remote>` later, the remote-tracking branches
@@ -455,9 +461,9 @@ a new stanza:
-------------------------------------------------
$ cat .git/config
...
-[remote "linux-nfs"]
- url = git://linux-nfs.org/pub/nfs-2.6.git
- fetch = +refs/heads/*:refs/remotes/linux-nfs/*
+[remote "staging"]
+ url = git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
+ fetch = +refs/heads/*:refs/remotes/staging/*
...
-------------------------------------------------
@@ -1835,7 +1841,7 @@ Once the index is updated with the results of the conflict
resolution, instead of creating a new commit, just run
-------------------------------------------------
-$ git am --resolved
+$ git am --continue
-------------------------------------------------
and Git will create the commit for you and continue applying the
@@ -2156,7 +2162,7 @@ To set this up, first create your work tree by cloning Linus's public
tree:
-------------------------------------------------
-$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git work
+$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git work
$ cd work
-------------------------------------------------
@@ -2198,7 +2204,7 @@ make it easy to push both branches to your public tree. (See
-------------------------------------------------
$ cat >> .git/config <<EOF
[remote "mytree"]
- url = master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git
+ url = master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux.git
push = release
push = test
EOF

0 comments on commit a195230

Please sign in to comment.
Something went wrong with that request. Please try again.