and bring ourselves back to the pre-merge state:</p>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt>$ git show-branch --more=3 master mybranch\r
+<pre><tt>$ git show-branch --more=2 master mybranch\r
! [master] Merge work in mybranch\r
* [mybranch] Merge work in mybranch\r
--\r
<p>This is the same <tt>git-read-tree</tt> command we have already seen,\r
but it takes three trees, unlike previous examples. This reads\r
the contents of each tree into different <em>stage</em> in the index\r
-file (the first tree goes to stage 1, the second stage 2,\r
+file (the first tree goes to stage 1, the second to stage 2,\r
etc.). After reading three trees into three stages, the paths\r
that are the same in all three stages are <em>collapsed</em> into stage\r
0. Also paths that are the same in two of three stages are\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 13-Nov-2007 08:20:50 UTC\r
+Last updated 14-Nov-2007 12:12:00 UTC\r
</div>\r
</div>\r
</body>\r
and bring ourselves back to the pre-merge state:
------------
-$ git show-branch --more=3 master mybranch
+$ git show-branch --more=2 master mybranch
! [master] Merge work in mybranch
* [mybranch] Merge work in mybranch
--
This is the same `git-read-tree` command we have already seen,
but it takes three trees, unlike previous examples. This reads
the contents of each tree into different 'stage' in the index
-file (the first tree goes to stage 1, the second stage 2,
+file (the first tree goes to stage 1, the second to stage 2,
etc.). After reading three trees into three stages, the paths
that are the same in all three stages are 'collapsed' into stage
0. Also paths that are the same in two of three stages are
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:10:06 UTC\r
+Last updated 14-Nov-2007 12:12:01 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:10:07 UTC\r
+Last updated 14-Nov-2007 12:12:01 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Nov-2007 02:45:18 UTC\r
+Last updated 14-Nov-2007 12:12:04 UTC\r
</div>\r
</div>\r
</body>\r
<div class="sectionbody">\r
<p><a href="git-status.html">git-status(1)</a>\r
<a href="git-rm.html">git-rm(1)</a>\r
+<a href="git-reset.html">git-reset(1)</a>\r
<a href="git-mv.html">git-mv(1)</a>\r
<a href="git-commit.html">git-commit(1)</a>\r
<a href="git-update-index.html">git-update-index(1)</a></p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Nov-2007 02:45:07 UTC\r
+Last updated 14-Nov-2007 12:11:20 UTC\r
</div>\r
</div>\r
</body>\r
--------
gitlink:git-status[1]
gitlink:git-rm[1]
+gitlink:git-reset[1]
gitlink:git-mv[1]
gitlink:git-commit[1]
gitlink:git-update-index[1]
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:30 UTC\r
+Last updated 14-Nov-2007 12:11:20 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 10-Aug-2007 09:49:28 UTC\r
+Last updated 14-Nov-2007 12:11:20 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 24-Sep-2007 07:36:59 UTC\r
+Last updated 14-Nov-2007 12:11:20 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:31 UTC\r
+Last updated 14-Nov-2007 12:11:21 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Oct-2007 01:21:45 UTC\r
+Last updated 14-Nov-2007 12:11:21 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 31-Oct-2007 05:56:47 UTC\r
+Last updated 14-Nov-2007 12:11:21 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 10-Aug-2007 09:49:28 UTC\r
+Last updated 14-Nov-2007 12:11:22 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 13-Nov-2007 08:20:50 UTC\r
+Last updated 14-Nov-2007 12:11:22 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 30-Sep-2007 00:49:43 UTC\r
+Last updated 14-Nov-2007 12:11:22 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:32 UTC\r
+Last updated 14-Nov-2007 12:11:23 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:33 UTC\r
+Last updated 14-Nov-2007 12:11:23 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:33 UTC\r
+Last updated 14-Nov-2007 12:11:23 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:33 UTC\r
+Last updated 14-Nov-2007 12:11:23 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Oct-2007 12:03:44 UTC\r
+Last updated 14-Nov-2007 12:11:23 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Nov-2007 11:13:00 UTC\r
+Last updated 14-Nov-2007 12:11:24 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:34 UTC\r
+Last updated 14-Nov-2007 12:11:24 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:34 UTC\r
+Last updated 14-Nov-2007 12:11:24 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:34 UTC\r
+Last updated 14-Nov-2007 12:11:24 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Nov-2007 11:13:00 UTC\r
+Last updated 14-Nov-2007 12:11:24 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 25-Aug-2007 03:53:06 UTC\r
+Last updated 14-Nov-2007 12:11:24 UTC\r
</div>\r
</div>\r
</body>\r
<div class="sectionbody">\r
<p>When recording your own work, the contents of modified files in\r
your working tree are temporarily stored to a staging area\r
-called the "index" with <a href="git-add.html">git-add(1)</a>. Removal\r
-of a file is staged with <a href="git-rm.html">git-rm(1)</a>. After building the\r
-state to be committed incrementally with these commands, <tt>git\r
-commit</tt> (without any pathname parameter) is used to record what\r
+called the "index" with <a href="git-add.html">git-add(1)</a>. A file can be\r
+reverted back, only in the index but not in the working tree,\r
+to that of the last commit with <tt>git-reset HEAD — <file></tt>,\r
+which effectively reverts <tt>git-add</tt> and prevents the changes to\r
+this file from participating in the next commit. After building\r
+the state to be committed incrementally with these commands,\r
+<tt>git commit</tt> (without any pathname parameter) is used to record what\r
has been staged so far. This is the most basic form of the\r
command. An example:</p>\r
<div class="listingblock">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 08-Aug-2007 09:20:37 UTC\r
+Last updated 14-Nov-2007 12:11:25 UTC\r
</div>\r
</div>\r
</body>\r
--------
When recording your own work, the contents of modified files in
your working tree are temporarily stored to a staging area
-called the "index" with gitlink:git-add[1]. Removal
-of a file is staged with gitlink:git-rm[1]. After building the
-state to be committed incrementally with these commands, `git
-commit` (without any pathname parameter) is used to record what
+called the "index" with gitlink:git-add[1]. A file can be
+reverted back, only in the index but not in the working tree,
+to that of the last commit with `git-reset HEAD -- <file>`,
+which effectively reverts `git-add` and prevents the changes to
+this file from participating in the next commit. After building
+the state to be committed incrementally with these commands,
+`git commit` (without any pathname parameter) is used to record what
has been staged so far. This is the most basic form of the
command. An example:
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 08-Nov-2007 08:06:31 UTC\r
+Last updated 14-Nov-2007 12:11:25 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:36 UTC\r
+Last updated 14-Nov-2007 12:11:26 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 31-Oct-2007 05:56:47 UTC\r
+Last updated 14-Nov-2007 12:11:26 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:36 UTC\r
+Last updated 14-Nov-2007 12:11:26 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 25-Aug-2007 03:53:08 UTC\r
+Last updated 14-Nov-2007 12:11:27 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 01-Sep-2007 11:16:24 UTC\r
+Last updated 14-Nov-2007 12:11:27 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:37 UTC\r
+Last updated 14-Nov-2007 12:11:27 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Nov-2007 02:45:08 UTC\r
+Last updated 14-Nov-2007 12:11:27 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Nov-2007 02:45:09 UTC\r
+Last updated 14-Nov-2007 12:11:28 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Nov-2007 02:45:11 UTC\r
+Last updated 14-Nov-2007 12:11:28 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Nov-2007 02:45:11 UTC\r
+Last updated 14-Nov-2007 12:11:29 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 25-Aug-2007 03:53:08 UTC\r
+Last updated 14-Nov-2007 12:11:30 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:39 UTC\r
+Last updated 14-Nov-2007 12:11:30 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 01-Sep-2007 11:16:25 UTC\r
+Last updated 14-Nov-2007 12:11:30 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Nov-2007 02:45:13 UTC\r
+Last updated 14-Nov-2007 12:11:31 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 25-Aug-2007 03:53:09 UTC\r
+Last updated 14-Nov-2007 12:11:31 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Oct-2007 12:03:48 UTC\r
+Last updated 14-Nov-2007 12:11:31 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Nov-2007 02:47:21 UTC\r
+Last updated 14-Nov-2007 12:11:31 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:41 UTC\r
+Last updated 14-Nov-2007 12:11:32 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 24-Jul-2007 08:10:04 UTC\r
+Last updated 14-Nov-2007 12:11:32 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Oct-2007 01:21:49 UTC\r
+Last updated 14-Nov-2007 12:11:32 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 13-Nov-2007 08:20:50 UTC\r
+Last updated 14-Nov-2007 12:11:32 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:42 UTC\r
+Last updated 14-Nov-2007 12:11:33 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 25-Aug-2007 03:53:10 UTC\r
+Last updated 14-Nov-2007 12:11:33 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:43 UTC\r
+Last updated 14-Nov-2007 12:11:33 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 25-Aug-2007 03:53:11 UTC\r
+Last updated 14-Nov-2007 12:11:33 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 25-Oct-2007 06:49:38 UTC\r
+Last updated 14-Nov-2007 12:11:33 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:43 UTC\r
+Last updated 14-Nov-2007 12:11:34 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Oct-2007 01:21:49 UTC\r
+Last updated 14-Nov-2007 12:11:34 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:43 UTC\r
+Last updated 14-Nov-2007 12:11:34 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:44 UTC\r
+Last updated 14-Nov-2007 12:11:34 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Oct-2007 01:21:50 UTC\r
+Last updated 14-Nov-2007 12:11:34 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 29-Aug-2007 07:30:56 UTC\r
+Last updated 14-Nov-2007 12:11:35 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 08-Nov-2007 08:06:31 UTC\r
+Last updated 14-Nov-2007 12:11:35 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 15-Sep-2007 07:45:31 UTC\r
+Last updated 14-Nov-2007 12:11:35 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:45 UTC\r
+Last updated 14-Nov-2007 12:11:35 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:45 UTC\r
+Last updated 14-Nov-2007 12:11:36 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:45 UTC\r
+Last updated 14-Nov-2007 12:11:36 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:45 UTC\r
+Last updated 14-Nov-2007 12:11:36 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:45 UTC\r
+Last updated 14-Nov-2007 12:11:36 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:46 UTC\r
+Last updated 14-Nov-2007 12:11:36 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Oct-2007 01:21:51 UTC\r
+Last updated 14-Nov-2007 12:11:36 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:46 UTC\r
+Last updated 14-Nov-2007 12:11:37 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:46 UTC\r
+Last updated 14-Nov-2007 12:11:37 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 31-Oct-2007 05:56:48 UTC\r
+Last updated 14-Nov-2007 12:11:38 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Nov-2007 02:47:21 UTC\r
+Last updated 14-Nov-2007 12:11:37 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:47 UTC\r
+Last updated 14-Nov-2007 12:11:38 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:47 UTC\r
+Last updated 14-Nov-2007 12:11:38 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Nov-2007 02:45:14 UTC\r
+Last updated 14-Nov-2007 12:11:39 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 25-Aug-2007 03:53:11 UTC\r
+Last updated 14-Nov-2007 12:11:40 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 24-Sep-2007 01:04:57 UTC\r
+Last updated 14-Nov-2007 12:11:40 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:48 UTC\r
+Last updated 14-Nov-2007 12:11:40 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:48 UTC\r
+Last updated 14-Nov-2007 12:11:40 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:48 UTC\r
+Last updated 14-Nov-2007 12:11:40 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:48 UTC\r
+Last updated 14-Nov-2007 12:11:41 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:48 UTC\r
+Last updated 14-Nov-2007 12:11:41 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 24-Sep-2007 01:04:58 UTC\r
+Last updated 14-Nov-2007 12:11:41 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:49 UTC\r
+Last updated 14-Nov-2007 12:11:41 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Oct-2007 12:03:50 UTC\r
+Last updated 14-Nov-2007 12:11:42 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 12-Nov-2007 04:26:39 UTC\r
+Last updated 14-Nov-2007 12:11:42 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:49 UTC\r
+Last updated 14-Nov-2007 12:11:42 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:50 UTC\r
+Last updated 14-Nov-2007 12:11:43 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Oct-2007 01:21:54 UTC\r
+Last updated 14-Nov-2007 12:11:43 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 25-Aug-2007 03:53:12 UTC\r
+Last updated 14-Nov-2007 12:11:44 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Oct-2007 01:21:56 UTC\r
+Last updated 14-Nov-2007 12:11:44 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:51 UTC\r
+Last updated 14-Nov-2007 12:11:44 UTC\r
</div>\r
</div>\r
</body>\r
Fetch updates for a named set of remotes in the repository as defined by\r
remotes.<group>. If a named group is not specified on the command line,\r
the configuration parameter remotes.default will get used; if\r
-remotes.default is not defined, all remotes which do not the\r
+remotes.default is not defined, all remotes which do not have the\r
configuration parameter remote.<name>.skipDefaultUpdate set to true will\r
be updated. (See <a href="git-config.html">git-config(1)</a>).\r
</p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 30-Sep-2007 00:49:44 UTC\r
+Last updated 14-Nov-2007 12:11:44 UTC\r
</div>\r
</div>\r
</body>\r
Fetch updates for a named set of remotes in the repository as defined by
remotes.<group>. If a named group is not specified on the command line,
the configuration parameter remotes.default will get used; if
-remotes.default is not defined, all remotes which do not the
+remotes.default is not defined, all remotes which do not have the
configuration parameter remote.<name>.skipDefaultUpdate set to true will
be updated. (See gitlink:git-config[1]).
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 25-Aug-2007 03:53:13 UTC\r
+Last updated 14-Nov-2007 12:11:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:51 UTC\r
+Last updated 14-Nov-2007 12:11:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:51 UTC\r
+Last updated 14-Nov-2007 12:11:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:52 UTC\r
+Last updated 14-Nov-2007 12:11:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 08-Nov-2007 08:06:31 UTC\r
+Last updated 14-Nov-2007 12:11:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 31-Oct-2007 05:56:48 UTC\r
+Last updated 14-Nov-2007 12:11:46 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 21-Aug-2007 02:20:19 UTC\r
+Last updated 14-Nov-2007 12:11:46 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 04-Nov-2007 11:13:00 UTC\r
+Last updated 14-Nov-2007 12:11:46 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Nov-2007 02:45:15 UTC\r
+Last updated 14-Nov-2007 12:11:47 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:53 UTC\r
+Last updated 14-Nov-2007 12:11:47 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 08-Nov-2007 08:06:32 UTC\r
+Last updated 14-Nov-2007 12:11:47 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Oct-2007 01:21:57 UTC\r
+Last updated 14-Nov-2007 12:11:48 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:54 UTC\r
+Last updated 14-Nov-2007 12:11:50 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:54 UTC\r
+Last updated 14-Nov-2007 12:11:48 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:54 UTC\r
+Last updated 14-Nov-2007 12:11:48 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:54 UTC\r
+Last updated 14-Nov-2007 12:11:49 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:54 UTC\r
+Last updated 14-Nov-2007 12:11:49 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:55 UTC\r
+Last updated 14-Nov-2007 12:11:49 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 25-Jul-2007 08:53:11 UTC\r
+Last updated 14-Nov-2007 12:11:50 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Oct-2007 01:21:58 UTC\r
+Last updated 14-Nov-2007 12:11:51 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 08-Aug-2007 09:20:38 UTC\r
+Last updated 14-Nov-2007 12:11:51 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Nov-2007 02:45:15 UTC\r
+Last updated 14-Nov-2007 12:11:53 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 30-Sep-2007 00:49:45 UTC\r
+Last updated 14-Nov-2007 12:11:52 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Oct-2007 01:22:01 UTC\r
+Last updated 14-Nov-2007 12:11:53 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Nov-2007 02:45:17 UTC\r
+Last updated 14-Nov-2007 12:11:53 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Oct-2007 01:22:00 UTC\r
+Last updated 14-Nov-2007 12:11:54 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Aug-2007 00:24:08 UTC\r
+Last updated 14-Nov-2007 12:11:54 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 30-Oct-2007 08:23:11 UTC\r
+Last updated 14-Nov-2007 12:12:05 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:58 UTC\r
+Last updated 14-Nov-2007 12:11:55 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:58 UTC\r
+Last updated 14-Nov-2007 12:11:55 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:58 UTC\r
+Last updated 14-Nov-2007 12:11:55 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:58 UTC\r
+Last updated 14-Nov-2007 12:11:55 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:59 UTC\r
+Last updated 14-Nov-2007 12:11:56 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:59 UTC\r
+Last updated 14-Nov-2007 12:11:56 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:59 UTC\r
+Last updated 14-Nov-2007 12:11:56 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:59 UTC\r
+Last updated 14-Nov-2007 12:11:56 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:59 UTC\r
+Last updated 14-Nov-2007 12:11:56 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 11-Aug-2007 08:29:16 UTC\r
+Last updated 14-Nov-2007 12:11:57 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:10:00 UTC\r
+Last updated 14-Nov-2007 12:11:57 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:10:00 UTC\r
+Last updated 14-Nov-2007 12:11:57 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 09-Nov-2007 10:03:24 UTC\r
+Last updated 14-Nov-2007 12:11:58 UTC\r
</div>\r
</div>\r
</body>\r
<tt>$Id:</tt> and ends with <tt>$</tt> in the worktree file is replaced\r
with <tt>$Id$</tt> upon check-in.</p>\r
<h4><tt>filter</tt></h4>\r
-<p>A <tt>filter</tt> attribute can be set to a string value. This names\r
+<p>A <tt>filter</tt> attribute can be set to a string value that names a\r
filter driver specified in the configuration.</p>\r
-<p>A filter driver consists of <tt>clean</tt> command and <tt>smudge</tt>\r
+<p>A filter driver consists of a <tt>clean</tt> command and a <tt>smudge</tt>\r
command, either of which can be left unspecified. Upon\r
-checkout, when <tt>smudge</tt> command is specified, the command is fed\r
-the blob object from its standard input, and its standard output\r
-is used to update the worktree file. Similarly, <tt>clean</tt> command\r
-is used to convert the contents of worktree file upon checkin.</p>\r
-<p>Missing filter driver definition in the config is not an error\r
+checkout, when the <tt>smudge</tt> command is specified, the command is\r
+fed the blob object from its standard input, and its standard\r
+output is used to update the worktree file. Similarly, the\r
+<tt>clean</tt> command is used to convert the contents of worktree file\r
+upon checkin.</p>\r
+<p>A missing filter driver definition in the config is not an error\r
but makes the filter a no-op passthru.</p>\r
<p>The content filtering is done to massage the content into a\r
shape that is more convenient for the platform, filesystem, and\r
-the user to use. The keyword here is "more convenient" and not\r
+the user to use. The key phrase here is "more convenient" and not\r
"turning something unusable into usable". In other words, the\r
intent is that if someone unsets the filter driver definition,\r
or does not have the appropriate filter program, the project\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 30-Sep-2007 00:49:45 UTC\r
+Last updated 14-Nov-2007 12:11:57 UTC\r
</div>\r
</div>\r
</body>\r
`filter`
^^^^^^^^
-A `filter` attribute can be set to a string value. This names
+A `filter` attribute can be set to a string value that names a
filter driver specified in the configuration.
-A filter driver consists of `clean` command and `smudge`
+A filter driver consists of a `clean` command and a `smudge`
command, either of which can be left unspecified. Upon
-checkout, when `smudge` command is specified, the command is fed
-the blob object from its standard input, and its standard output
-is used to update the worktree file. Similarly, `clean` command
-is used to convert the contents of worktree file upon checkin.
+checkout, when the `smudge` command is specified, the command is
+fed the blob object from its standard input, and its standard
+output is used to update the worktree file. Similarly, the
+`clean` command is used to convert the contents of worktree file
+upon checkin.
-Missing filter driver definition in the config is not an error
+A missing filter driver definition in the config is not an error
but makes the filter a no-op passthru.
The content filtering is done to massage the content into a
shape that is more convenient for the platform, filesystem, and
-the user to use. The keyword here is "more convenient" and not
+the user to use. The key phrase here is "more convenient" and not
"turning something unusable into usable". In other words, the
intent is that if someone unsets the filter driver definition,
or does not have the appropriate filter program, the project
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 30-Sep-2007 00:49:46 UTC\r
+Last updated 14-Nov-2007 12:11:58 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Oct-2007 01:22:03 UTC\r
+Last updated 14-Nov-2007 12:11:57 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:10:01 UTC\r
+Last updated 14-Nov-2007 12:11:58 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 23-Oct-2007 01:22:08 UTC\r
+Last updated 14-Nov-2007 12:12:05 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Oct-2007 12:03:51 UTC\r
+Last updated 14-Nov-2007 12:12:04 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 10-Nov-2007 11:26:14 UTC\r
+Last updated 14-Nov-2007 12:12:02 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:10:11 UTC\r
+Last updated 14-Nov-2007 12:12:06 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:10:08 UTC\r
+Last updated 14-Nov-2007 12:12:03 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 19-Jul-2007 02:10:04 UTC\r
+Last updated 14-Nov-2007 12:12:00 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 25-Aug-2007 03:53:15 UTC\r
+Last updated 14-Nov-2007 12:11:59 UTC\r
</div>\r
</div>\r
</body>\r
[65934a9a028b88e83e2b0f8b36618fe503349f8e] BLOCK: Make USB storage depend on SCSI rather than selecting it [try #6]</p></div><p>If you run "git branch" at this point, you'll see that git has
temporarily moved you to a new branch named "bisect". This branch
points to a commit (with commit id 65934…) that is reachable from
-v2.6.19 but not from v2.6.18. Compile and test it, and see whether
+"master" but not from v2.6.18. Compile and test it, and see whether
it crashes. Assume it does crash. Then:</p><div class="literallayout"><p>$ git bisect bad<br>
Bisecting: 1769 revisions left to test after this<br>
[7eff82c8b1511017ae605f0c99ac275a7e21b867] i2c-core: Drop useless bitmaskings</p></div><p>checks out an older version. Continue like this, telling git at each
realize that the branch was the only reference you had to that point in
history.</p><p>Fortunately, git also keeps a log, called a "reflog", of all the
previous values of each branch. So in this case you can still find the
-old history using, for example,</p><div class="literallayout"><p>$ git log master@{1}</p></div><p>This lists the commits reachable from the previous version of the head.
-This syntax can be used to with any git command that accepts a commit,
+old history using, for example,</p><div class="literallayout"><p>$ git log master@{1}</p></div><p>This lists the commits reachable from the previous version of the branch.
+This syntax can be used with any git command that accepts a commit,
not just with git log. Some other examples:</p><div class="literallayout"><p>$ git show master@{2} # See where the branch pointed 2,<br>
$ git show master@{3} # 3, ... changes ago.<br>
$ gitk master@{yesterday} # See where it pointed yesterday,<br>
If you run "git branch" at this point, you'll see that git has
temporarily moved you to a new branch named "bisect". This branch
points to a commit (with commit id 65934...) that is reachable from
-v2.6.19 but not from v2.6.18. Compile and test it, and see whether
+"master" but not from v2.6.18. Compile and test it, and see whether
it crashes. Assume it does crash. Then:
-------------------------------------------------
$ git log master@{1}
-------------------------------------------------
-This lists the commits reachable from the previous version of the head.
-This syntax can be used to with any git command that accepts a commit,
+This lists the commits reachable from the previous version of the branch.
+This syntax can be used with any git command that accepts a commit,
not just with git log. Some other examples:
-------------------------------------------------