<p>\r
Update all paths in the index file. This flag notices\r
files that have been modified and deleted, but new files\r
- you have not told about git are not affected.\r
+ you have not told git about are not affected.\r
</p>\r
</dd>\r
<dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 13-Jan-2006 19:58:26 PDT\r
+Last updated 21-Jan-2006 23:50:16 PDT\r
</div>\r
</div>\r
</body>\r
-a|--all::
Update all paths in the index file. This flag notices
files that have been modified and deleted, but new files
- you have not told about git are not affected.
+ you have not told git about are not affected.
-c or -C <commit>::
Take existing commit object, and reuse the log message
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-grep</em> [<option>…] <pattern> [<path>…]</p>\r
+<p><em>git-grep</em> [<option>…] [-e] <pattern> [--] [<path>…]</p>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
<div class="sectionbody">\r
<dl>\r
<dt>\r
+<tt>--</tt>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Signals the end of options; the rest of the parameters\r
+ are <path> limiters.\r
+</p>\r
+</dd>\r
+<dt>\r
<option>…\r
</dt>\r
<dd>\r
<p>\r
Either an option to pass to <tt>grep</tt> or <tt>git-ls-files</tt>.\r
- Some <tt>grep</tt> options, such as <tt>-C</tt> and <tt>-m</tt>, that take\r
- parameters are known to <tt>git-grep</tt>.\r
</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>The following are the specific `git-ls-files` options\r
+that may be given: `-o`, `--cached`, `--deleted`, `--others`,\r
+`--killed`, `--ignored`, `--modified`, `--exclude=*`,\r
+`--exclude-from=*`, and `--exclude-per-directory=*`.</tt></pre>\r
+</div></div>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>All other options will be passed to `grep`.</tt></pre>\r
+</div></div>\r
</dd>\r
<dt>\r
<pattern>\r
</dt>\r
<dd>\r
<p>\r
- The pattern to look for.\r
+ The pattern to look for. The first non option is taken\r
+ as the pattern; if your pattern begins with a dash, use\r
+ <tt>-e <pattern></tt>.\r
</p>\r
</dd>\r
<dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 06-Jan-2006 17:12:33 PDT\r
+Last updated 21-Jan-2006 23:50:17 PDT\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-'git-grep' [<option>...]
<pattern> [<path>...]
+'git-grep' [<option>...]
[-e] <pattern> [--] [<path>...]
DESCRIPTION
-----------
OPTIONS
-------
+`--`::
+ Signals the end of options; the rest of the parameters
+ are <path> limiters.
+
<option>...::
Either an option to pass to `grep` or `git-ls-files`.
- Some `grep` options, such as `-C` and `-m`, that take
- parameters are known to `git-grep`.
+
+ The following are the specific `git-ls-files` options
+ that may be given: `-o`, `--cached`, `--deleted`, `--others`,
+ `--killed`, `--ignored`, `--modified`, `--exclude=*`,
+ `--exclude-from=*`, and `--exclude-per-directory=*`.
+
+ All other options will be passed to `grep`.
<pattern>::
- The pattern to look for.
+ The pattern to look for. The first non option is taken
+ as the pattern; if your pattern begins with a dash, use
+ `-e <pattern>`.
<path>...::
Optional paths to limit the set of files to be searched;
</p>\r
</dd>\r
<dt>\r
+--directory\r
+</dt>\r
+<dd>\r
+<p>\r
+ If a whole directory is classified as "other", show just its\r
+ name (with a trailing slash) and not its whole contents.\r
+</p>\r
+</dd>\r
+<dt>\r
-u|--unmerged\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 06-Jan-2006 17:12:39 PDT\r
+Last updated 21-Jan-2006 23:50:18 PDT\r
</div>\r
</div>\r
</body>\r
-s|--stage::
Show stage files in the output
+--directory::
+ If a whole directory is classified as "other", show just its
+ name (with a trailing slash) and not its whole contents.
+
-u|--unmerged::
Show unmerged files in the output (forces --stage)
Interrupted workflow\r
</dt>\r
<dd>\r
-<p>You can get interrupted by an ungent fix request while you are\r
-still in the middle of a large change. The files in your\r
+<p>Suppose you are interrupted by an urgent fix request while you\r
+are in the middle of a large change. The files in your\r
working tree are not in any shape to be committed yet, but you\r
need to get to the other branch for a quick bugfix.</p>\r
<div class="listingblock">\r
$ git reset <b>(3)</b>\r
\r
<b>(1)</b> This commit will get blown away so a throw-away log message is OK.\r
-<b>(2)</b> This removes the 'WIP' commit from the commit history, and makes\r
- your working tree in the state just before you made that snapshot.\r
+<b>(2)</b> This removes the 'WIP' commit from the commit history, and sets\r
+ your working tree to the state just before you made that snapshot.\r
<b>(3)</b> After <b>(2)</b>, the index file still has all the WIP changes you\r
committed in <b>(1)</b>. This sets it to the last commit you were\r
basing the WIP changes on.</tt></pre>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 13-Jan-2006 19:58:30 PDT\r
+Last updated 21-Jan-2006 23:50:19 PDT\r
</div>\r
</div>\r
</body>\r
Interrupted workflow::
+
-You can get interrupted by an ungent fix request while you are
-still in the middle of a large change. The files in your
+Suppose you are interrupted by an urgent fix request while you
+are in the middle of a large change. The files in your
working tree are not in any shape to be committed yet, but you
need to get to the other branch for a quick bugfix.
+
$ git reset <3>
<1> This commit will get blown away so a throw-away log message is OK.
-<2> This removes the 'WIP' commit from the commit history, and makes
- your working tree in the state just before you made that snapshot.
+<2> This removes the 'WIP' commit from the commit history, and sets
+ your working tree to the state just before you made that snapshot.
<3> After <2>, the index file still has all the WIP changes you
committed in <1>. This sets it to the last commit you were
basing the WIP changes on.
<div class="sectionbody">\r
<p>Imports a SVN repository into git. It will either create a new\r
repository, or incrementally import into an existing one.</p>\r
-<div class="hlist"><table>\r
-<tr>\r
-<td class="hlist1">\r
-SVN access is done by the SVN\r
-</td>\r
-<td class="hlist2">\r
-Perl module.\r
-</td>\r
-</tr>\r
-</table></div>\r
+<p>SVN access is done by the SVN::Perl module.</p>\r
<p>git-svnimport assumes that SVN repositories are organized into one\r
"trunk" directory where the main development happens, "branch/FOO"\r
directories for branches, and "/tags/FOO" directories for tags.\r
</p>\r
<div class="literalblock">\r
<div class="content">\r
-<pre><tt>Formerly, this option controlled how many revisions to pull, due to\r
-SVN memory leaks. (These have been worked around.)</tt></pre>\r
+<pre><tt>Formerly, this option controlled how many revisions to pull,\r
+due to SVN memory leaks. (These have been worked around.)</tt></pre>\r
</div></div>\r
</dd>\r
<dt>\r
repository itself; it usually ends in "/svn".</p>\r
</dd>\r
<dt>\r
-<SVN_repository_URL>\r
+<path>\r
</dt>\r
<dd>\r
<p>\r
- The URL of the SVN module you want to import. For local\r
- repositories, use "file:///absolute/path".\r
+ The path to the module you want to check out.\r
</p>\r
</dd>\r
-</dl>\r
-<p><path>\r
- The path to the module you want to check out.</p>\r
-<dl>\r
<dt>\r
-h\r
</dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 06-Jan-2006 17:12:46 PDT\r
+Last updated 21-Jan-2006 23:50:20 PDT\r
</div>\r
</div>\r
</body>\r
Imports a SVN repository into git. It will either create a new
repository, or incrementally import into an existing one.
-SVN access is done by the SVN:: Perl module.
+SVN access is done by the SVN::Perl module.
git-svnimport assumes that SVN repositories are organized into one
"trunk" directory where the main development happens, "branch/FOO"
-l <max_rev>::
Specify a maximum revision number to pull.
- Formerly, this option controlled how many revisions to pull, due to
- SVN memory leaks. (These have been worked around.)
+ Formerly, this option controlled how many revisions to pull,
+ due to SVN memory leaks. (These have been worked around.)
-v::
Verbosity: let 'svnimport' report what it is doing.
If you're using the "-d" or "-D" option, this is the URL of the SVN
repository itself; it usually ends in "/svn".
-<SVN_repository_URL>::
- The URL of the SVN module you want to import. For local
- repositories, use "file:///absolute/path".
-
-<path>
+<path>::
The path to the module you want to check out.
-h::
projects / git.git / commitdiff