<p>git has a couple of alternatives, though, that you may find sufficient\r
or even superior depending on your use. One is called "git-whatchanged"\r
(for obvious reasons) and the other one is called "pickaxe" ("a tool for\r
-the software archeologist").</p>\r
+the software archaeologist").</p>\r
<p>The "git-whatchanged" script is a truly trivial script that can give you\r
a good overview of what has changed in a file or a directory (or an\r
arbitrary list of files or directories). The "pickaxe" support is an\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:17:06 PDT\r
+Last updated 06-Jan-2006 17:12:56 PDT\r
</div>\r
</div>\r
</body>\r
git has a couple of alternatives, though, that you may find sufficient
or even superior depending on your use. One is called "git-whatchanged"
(for obvious reasons) and the other one is called "pickaxe" ("a tool for
-the software archeologist").
+the software archaeologist").
The "git-whatchanged" script is a truly trivial script that can give you
a good overview of what has changed in a file or a directory (or an
What -p option produces is slightly different from the
traditional diff format.
-1. It is preceeded with a "git diff" header, that looks like
+1. It is preceded with a "git diff" header, that looks like
this:
diff --git a/file1 b/file2
--abbrev[=<n>]::
Instead of showing the full 40-byte hexadecimal object
name in diff-raw format output and diff-tree header
- lines, show only handful dhexigits prefix. This is
+ lines, show only handful hexdigits prefix. This is
independent of --full-index option above, which controls
the diff-patch output format. Non default number of
digits can be specified with --abbrev=<n>.
<h2>DISCUSSION</h2>\r
<div class="sectionbody">\r
<p>The list of <file> given to the command is fed to <tt>git-ls-files</tt>\r
-command to list files that are not registerd in the index and\r
+command to list files that are not registered in the index and\r
are not ignored/excluded by <tt>$GIT_DIR/info/exclude</tt> file or\r
<tt>.gitignore</tt> file in each directory. This means two things:</p>\r
<ol>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:15:43 PDT\r
+Last updated 06-Jan-2006 17:11:58 PDT\r
</div>\r
</div>\r
</body>\r
----------
The list of <file> given to the command is fed to `git-ls-files`
-command to list files that are not registerd in the index and
+command to list files that are not registered in the index and
are not ignored/excluded by `$GIT_DIR/info/exclude` file or
`.gitignore` file in each directory. This means two things:
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-am</em> [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>…\r
-<em>git-am</em> [--skip | --resolved]</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-am</em> [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>…\r
+<em>git-am</em> [--skip | --resolved]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:15:44 PDT\r
+Last updated 06-Jan-2006 17:11:59 PDT\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
+[verse]
'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>...
'git-am' [--skip | --resolved]
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-apply</em> [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [<patch>…]</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-apply</em> [--stat] [--numstat] [--summary] [--check] [--index] [--apply]\r
+ [--no-add] [--index-info] [--allow-binary-replacement] [-z]\r
+ [<patch>…]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:15:45 PDT\r
+Last updated 06-Jan-2006 17:12:01 PDT\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [<patch>...]
+[verse]
+'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply]
+ [--no-add] [--index-info] [--allow-binary-replacement] [-z]
+ [<patch>...]
DESCRIPTION
-----------
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><tt>git-archimport</tt> [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ]\r
- [ -D depth ] [ -t tempdir ]\r
- <archive/branch> [ <archive/branch> ]</p>\r
+<div class="verseblock">\r
+<div class="content"><tt>git-archimport</tt> [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]\r
+ <archive/branch> [ <archive/branch> ]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
<p>Imports a project from one or more Arch repositories. It will follow branches\r
and repositories within the namespaces defined by the <archive/branch>\r
-parameters suppplied. If it cannot find the remote branch a merge comes from\r
+parameters supplied. If it cannot find the remote branch a merge comes from\r
it will just import it as a regular commit. If it can find it, it will mark it\r
as a merge whenever possible (see discussion below).</p>\r
<p>The script expects you to provide the key roots where it can start the import\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:15:47 PDT\r
+Last updated 06-Jan-2006 17:12:04 PDT\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-`git-archimport` [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ]
- [ -D depth ] [ -t tempdir ]
- <archive/branch> [ <archive/branch> ]
+[verse]
+`git-archimport` [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
+ <archive/branch> [ <archive/branch> ]
DESCRIPTION
-----------
Imports a project from one or more Arch repositories. It will follow branches
and repositories within the namespaces defined by the <archive/branch>
-parameters suppplied. If it cannot find the remote branch a merge comes from
+parameters supplied. If it cannot find the remote branch a merge comes from
it will just import it as a regular commit. If it can find it, it will mark it
as a merge whenever possible (see discussion below).
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-cat-file</em> (-t | -s | -e | <type>) <object></p>\r
+<p><em>git-cat-file</em> [-t | -s | -e | <type>] <object></p>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:15:49 PDT\r
+Last updated 06-Jan-2006 17:12:05 PDT\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-'git-cat-file' (-t | -s | -e | <type>) <object>
+'git-cat-file' [-t | -s | -e | <type>] <object>
DESCRIPTION
-----------
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-checkout-index</em> [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]\r
- [--stage=<number>] [--] <file>…</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-checkout-index</em> [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]\r
+ [--stage=<number>] [--] <file>…</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:15:51 PDT\r
+Last updated 06-Jan-2006 17:12:07 PDT\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
+[verse]
'git-checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
- [--stage=<number>] [--] <file>...
+ [--stage=<number>] [--] <file>...
DESCRIPTION
-----------
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-clone</em> [-l [-s]] [-q] [-n] [-o <name>] [-u <upload-pack>] <repository> [<directory>]</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-clone</em> [-l [-s]] [-q] [-n] [-o <name>] [-u <upload-pack>]\r
+ <repository> [<directory>]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:15:54 PDT\r
+Last updated 06-Jan-2006 17:12:09 PDT\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-'git-clone' [-l [-s]] [-q] [-n] [-o <name>] [-u <upload-pack>] <repository> [<directory>]
+[verse]
+'git-clone' [-l [-s]] [-q] [-n] [-o <name>] [-u <upload-pack>]
+ <repository> [<directory>]
DESCRIPTION
-----------
GIT_COMMITTER_EMAIL</tt></pre>\r
</div></div>\r
<p>(nb "<", ">" and "\n"s are stripped)</p>\r
-<p>In <tt>.git/config</tt> file, the following items are used:</p>\r
+<p>In <tt>.git/config</tt> file, the following items are used for GIT_AUTHOR_NAME and\r
+GIT_AUTHOR_EMAIL:</p>\r
<div class="literalblock">\r
<div class="content">\r
<pre><tt>[user]\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:15:55 PDT\r
+Last updated 06-Jan-2006 17:12:11 PDT\r
</div>\r
</div>\r
</body>\r
(nb "<", ">" and "\n"s are stripped)
-In `.git/config` file, the following items are used:
+In `.git/config` file, the following items are used for GIT_AUTHOR_NAME and
+GIT_AUTHOR_EMAIL:
[user]
name = "Your Name"
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-commit</em> [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] [-e] [--] <file>…</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-commit</em> [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>]\r
+ [-e] [--] <file>…</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:15:56 PDT\r
+Last updated 06-Jan-2006 17:12:13 PDT\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] [-e] [--] <file>...
+[verse]
+'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>]
+ [-e] [--] <file>...
DESCRIPTION
-----------
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p>git-cvsexportcommmit.perl\r
- [ -h ] [ -v ] [ -c ] [ -p ] [PARENTCOMMIT] COMMITID</p>\r
+<p><em>git-cvsexportcommmit</em> [-h] [-v] [-c] [-p] [PARENTCOMMIT] COMMITID</p>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:15:58 PDT\r
+Last updated 06-Jan-2006 17:12:15 PDT\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-git-cvsexportcommmit.perl
- [ -h ] [ -v ] [ -c ] [ -p ] [PARENTCOMMIT] COMMITID
+'git-cvsexportcommmit' [-h] [-v] [-c] [-p] [PARENTCOMMIT] COMMITID
DESCRIPTION
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-cvsimport</em> [ -o <branch-for-HEAD> ] [ -h ] [ -v ]\r
- [ -d <CVSROOT> ] [ -p <options-for-cvsps> ]\r
- [ -C <git_repository> ] [ -i ] [ -P <file> ] [ -k ]\r
- [ -s <subst> ] [ -m ] [ -M regex ] [ <CVS_module> ]</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-cvsimport</em> [-o <branch-for-HEAD>] [-h] [-v] [-d <CVSROOT>] [-s <subst>]\r
+ [-p <options-for-cvsps>] [-C <git_repository>] [-i] [-P <file>]\r
+ [-m] [-M regex] [<CVS_module>]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:15:58 PDT\r
+Last updated 06-Jan-2006 17:12:15 PDT\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-'git-cvsimport' [ -o <branch-for-HEAD> ] [ -h ] [ -v ]
- [ -d <CVSROOT> ] [ -p <options-for-cvsps> ]
- [ -C <git_repository> ] [ -i ] [ -P <file> ] [ -k ]
- [ -s <subst> ] [ -m ] [ -M regex ] [ <CVS_module> ]
+[verse]
+'git-cvsimport' [-o <branch-for-HEAD>] [-h] [-v] [-d <CVSROOT>] [-s <subst>]
+ [-p <options-for-cvsps>] [-C <git_repository>] [-i] [-P <file>]
+ [-m] [-M regex] [<CVS_module>]
DESCRIPTION
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-daemon</em> [--verbose] [--syslog] [--inetd | --port=n] [--export-all]\r
- [--timeout=n] [--init-timeout=n] [--strict-paths] [directory…]</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-daemon</em> [--verbose] [--syslog] [--inetd | --port=n] [--export-all]\r
+ [--timeout=n] [--init-timeout=n] [--strict-paths] [directory…]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:15:59 PDT\r
+Last updated 06-Jan-2006 17:12:17 PDT\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
+[verse]
'git-daemon' [--verbose] [--syslog] [--inetd | --port=n] [--export-all]
- [--timeout=n] [--init-timeout=n] [--strict-paths] [directory...]
+ [--timeout=n] [--init-timeout=n] [--strict-paths] [directory...]
DESCRIPTION
-----------
<p>\r
Instead of showing the full 40-byte hexadecimal object\r
name in diff-raw format output and diff-tree header\r
- lines, show only handful dhexigits prefix. This is\r
+ lines, show only handful hexdigits prefix. This is\r
independent of --full-index option above, which controls\r
the diff-patch output format. Non default number of\r
digits can be specified with --abbrev=<n>.\r
<ol>\r
<li>\r
<p>\r
-It is preceeded with a "git diff" header, that looks like\r
+It is preceded with a "git diff" header, that looks like\r
this:\r
</p>\r
<div class="literalblock">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:00 PDT\r
+Last updated 06-Jan-2006 17:12:18 PDT\r
</div>\r
</div>\r
</body>\r
<p>\r
Instead of showing the full 40-byte hexadecimal object\r
name in diff-raw format output and diff-tree header\r
- lines, show only handful dhexigits prefix. This is\r
+ lines, show only handful hexdigits prefix. This is\r
independent of --full-index option above, which controls\r
the diff-patch output format. Non default number of\r
digits can be specified with --abbrev=<n>.\r
<ol>\r
<li>\r
<p>\r
-It is preceeded with a "git diff" header, that looks like\r
+It is preceded with a "git diff" header, that looks like\r
this:\r
</p>\r
<div class="literalblock">\r
contents (the ones I'd write with a "git-write-tree")</tt></pre>\r
</div></div>\r
<p>For example, let's say that you have worked on your working directory, updated\r
-some files in the index and are ready to commit. You want to see eactly\r
+some files in the index and are ready to commit. You want to see exactly\r
<strong>what</strong> you are going to commit is without having to write a new tree\r
object and compare it that way, and to do that, you just do</p>\r
<div class="literalblock">\r
actually look at the contents of the file at all. So maybe\r
<tt>kernel/sched.c</tt> hasn't actually changed, and it's just that you\r
touched it. In either case, it's a note that you need to\r
-"git-upate-index" it to make the index be in sync.</td>\r
+"git-update-index" it to make the index be in sync.</td>\r
</tr></table>\r
</div>\r
<div class="admonitionblock">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:01 PDT\r
+Last updated 06-Jan-2006 17:12:20 PDT\r
</div>\r
</div>\r
</body>\r
contents (the ones I'd write with a "git-write-tree")
For example, let's say that you have worked on your working directory, updated
-some files in the index and are ready to commit. You want to see eactly
+some files in the index and are ready to commit. You want to see exactly
*what* you are going to commit is without having to write a new tree
object and compare it that way, and to do that, you just do
actually look at the contents of the file at all. So maybe
`kernel/sched.c` hasn't actually changed, and it's just that you
touched it. In either case, it's a note that you need to
-"git-upate-index" it to make the index be in sync.
+"git-update-index" it to make the index be in sync.
NOTE: You can have a mixture of files show up as "has been updated"
and "is still dirty in the working directory" together. You can always
<p>\r
Instead of showing the full 40-byte hexadecimal object\r
name in diff-raw format output and diff-tree header\r
- lines, show only handful dhexigits prefix. This is\r
+ lines, show only handful hexdigits prefix. This is\r
independent of --full-index option above, which controls\r
the diff-patch output format. Non default number of\r
digits can be specified with --abbrev=<n>.\r
<ol>\r
<li>\r
<p>\r
-It is preceeded with a "git diff" header, that looks like\r
+It is preceded with a "git diff" header, that looks like\r
this:\r
</p>\r
<div class="literalblock">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:03 PDT\r
+Last updated 06-Jan-2006 17:12:22 PDT\r
</div>\r
</div>\r
</body>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-diff-tree</em> [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] [-t] [-r] [--root] [<common diff options>] <tree-ish> [<tree-ish>] [<path>…]</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-diff-tree</em> [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] [-t] [-r]\r
+ [--root] [<common diff options>] <tree-ish> [<tree-ish>] [<path>…]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
<p>\r
Instead of showing the full 40-byte hexadecimal object\r
name in diff-raw format output and diff-tree header\r
- lines, show only handful dhexigits prefix. This is\r
+ lines, show only handful hexdigits prefix. This is\r
independent of --full-index option above, which controls\r
the diff-patch output format. Non default number of\r
digits can be specified with --abbrev=<n>.\r
<p>\r
By default, "git-diff-tree --stdin" shows differences,\r
either in machine-readable form (without <em>-p</em>) or in patch\r
- form (with <em>-p</em>). This output can be supressed. It is\r
+ form (with <em>-p</em>). This output can be suppressed. It is\r
only useful with <em>-v</em> flag.\r
</p>\r
</dd>\r
<ol>\r
<li>\r
<p>\r
-It is preceeded with a "git diff" header, that looks like\r
+It is preceded with a "git diff" header, that looks like\r
this:\r
</p>\r
<div class="literalblock">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:04 PDT\r
+Last updated 06-Jan-2006 17:12:24 PDT\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-'git-diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] [-t] [-r] [--root] [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]
+[verse]
+'git-diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] [-t] [-r]
+ [--root] [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]
DESCRIPTION
-----------
-s::
By default, "git-diff-tree --stdin" shows differences,
either in machine-readable form (without '-p') or in patch
- form (with '-p'). This output can be supressed. It is
+ form (with '-p'). This output can be suppressed. It is
only useful with '-v' flag.
-v::
<b>(1)</b> instead of using the tip of the current branch, compare with the\r
tip of "test" branch.\r
<b>(2)</b> instead of comparing with the tip of "test" branch, compare with\r
-the tip of the curren branch, but limit the comparison to the\r
+the tip of the current branch, but limit the comparison to the\r
file "test".\r
<b>(3)</b> compare the version before the last commit and the last commit.</tt></pre>\r
</div></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:05 PDT\r
+Last updated 06-Jan-2006 17:12:28 PDT\r
</div>\r
</div>\r
</body>\r
<1> instead of using the tip of the current branch, compare with the
tip of "test" branch.
<2> instead of comparing with the tip of "test" branch, compare with
-the tip of the curren branch, but limit the comparison to the
+the tip of the current branch, but limit the comparison to the
file "test".
<3> compare the version before the last commit and the last commit.
------------
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-format-patch</em> [-n | -k] [-o <dir> | --stdout] [-s] [-c] [--mbox] [--diff-options] <his> [<mine>]</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-format-patch</em> [-n | -k] [-o <dir> | --stdout] [-s] [-c] [--mbox]\r
+ [--diff-options] <his> [<mine>]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</div>\r
<h2>See Also</h2>\r
<div class="sectionbody">\r
-<p><a href="git-am.html">git-am(1)</a>, gitlink:git-send-email</p>\r
+<p><a href="git-am.html">git-am(1)</a>, <a href="git-send-email.html">git-send-email(1)</a></p>\r
</div>\r
<h2>Author</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:08 PDT\r
+Last updated 06-Jan-2006 17:12:29 PDT\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-'git-format-patch' [-n | -k] [-o <dir> | --stdout] [-s] [-c] [--mbox] [--diff-options] <his> [<mine>]
+[verse]
+'git-format-patch' [-n | -k] [-o <dir> | --stdout] [-s] [-c] [--mbox]
+ [--diff-options] <his> [<mine>]
DESCRIPTION
-----------
See Also
--------
-gitlink:git-am[1], gitlink:git-send-email
+gitlink:git-am[1], gitlink:git-send-email[1]
Author
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-fsck-objects</em> [--tags] [--root] [--unreachable] [--cache] [--standalone | --full] [--strict] [<object>*]</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-fsck-objects</em> [--tags] [--root] [--unreachable] [--cache]\r
+ [--standalone | --full] [--strict] [<object>*]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:09 PDT\r
+Last updated 06-Jan-2006 17:12:31 PDT\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-'git-fsck-objects' [--tags] [--root] [--unreachable] [--cache] [--standalone | --full] [--strict] [<object>*]
+[verse]
+'git-fsck-objects' [--tags] [--root] [--unreachable] [--cache]
+ [--standalone | --full] [--strict] [<object>*]
DESCRIPTION
-----------
</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>…] <pattern> [<path>…]</p>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:10 PDT\r
+Last updated 06-Jan-2006 17:12:33 PDT\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-'git-grep' <option>... <pattern> <path>...
+'git-grep' [<option>...] <pattern> [<path>...]
DESCRIPTION
-----------
The pattern to look for.
<path>...::
-
Optional paths to limit the set of files to be searched;
passed to `git-ls-files`.
<h2>NAME</h2>\r
<div class="sectionbody">\r
<p>git-http-fetch -\r
- Downloads a remote git repository via HTTP\r
+ downloads a remote git repository via HTTP\r
</p>\r
</div>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-http-fetch</em> [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url</p>\r
+<p><em>git-http-fetch</em> [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] <commit> <url></p>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:11 PDT\r
+Last updated 06-Jan-2006 17:12:35 PDT\r
</div>\r
</div>\r
</body>\r
NAME
----
-git-http-fetch - Downloads a remote git repository via HTTP
+git-http-fetch - downloads a remote git repository via HTTP
SYNOPSIS
--------
-'git-http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] commit-id url
+'git-http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] <commit> <url>
DESCRIPTION
-----------
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-init-db</em> [--template=<template_directory>]</p>\r
+<p><em>git-init-db</em> [--template=<template_directory>] [--shared]</p>\r
</div>\r
<h2>OPTIONS</h2>\r
<div class="sectionbody">\r
Provide the directory in from which templates will be used.\r
</p>\r
</dd>\r
+<dt>\r
+--shared\r
+</dt>\r
+<dd>\r
+<p>\r
+ Specify that the git repository is to be shared amongst several users.\r
+</p>\r
+</dd>\r
</dl>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<p>If the object storage directory is specified via the <tt>$GIT_OBJECT_DIRECTORY</tt>\r
environment variable then the sha1 directories are created underneath -\r
otherwise the default <tt>$GIT_DIR/objects</tt> directory is used.</p>\r
-<p><tt>git-init-db</tt> won't hurt an existing repository.</p>\r
+<p>A shared repository allows users belonging to the same group to push into that\r
+repository. When specifying <tt>--shared</tt> the config variable "core.sharedRepository"\r
+is set to <em>true</em> so that directories under <tt>$GIT_DIR</tt> are made group writable\r
+(and g+sx, since the git group may be not the primary group of all users).</p>\r
+<p>Running <tt>git-init-db</tt> in an existing repository is safe. It will not overwrite\r
+things that are already there. The primary reason for rerunning <tt>git-init-db</tt>\r
+is to pick up newly added templates.</p>\r
</div>\r
<h2>EXAMPLES</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:13 PDT\r
+Last updated 06-Jan-2006 17:12:38 PDT\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-'git-init-db' [--template=<template_directory>]
+'git-init-db' [--template=<template_directory>] [--shared]
OPTIONS
--template=<template_directory>::
Provide the directory in from which templates will be used.
+--shared::
+ Specify that the git repository is to be shared amongst several users.
+
DESCRIPTION
-----------
environment variable then the sha1 directories are created underneath -
otherwise the default `$GIT_DIR/objects` directory is used.
-`git-init-db` won't hurt an existing repository.
+A shared repository allows users belonging to the same group to push into that
+repository. When specifying `--shared` the config variable "core.sharedRepository"
+is set to 'true' so that directories under `$GIT_DIR` are made group writable
+(and g+sx, since the git group may be not the primary group of all users).
+
+
+Running `git-init-db` in an existing repository is safe. It will not overwrite
+things that are already there. The primary reason for rerunning `git-init-db`
+is to pick up newly added templates.
+
EXAMPLES
C\r
</td>\r
<td class="hlist2">\r
-modifed/changed\r
+modified/changed\r
</td>\r
</tr>\r
<tr>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:16 PDT\r
+Last updated 06-Jan-2006 17:12:39 PDT\r
</div>\r
</div>\r
</body>\r
H:: cached
M:: unmerged
R:: removed/deleted
- C:: modifed/changed
+ C:: modified/changed
K:: to be killed
? other
</dt>\r
<dd>\r
<p>\r
- Write the pack contents (what would have been writtin to\r
+ Write the pack contents (what would have been written to\r
.pack file) out to the standard output.\r
</p>\r
</dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:24 PDT\r
+Last updated 06-Jan-2006 17:12:41 PDT\r
</div>\r
</div>\r
</body>\r
output of the command.
--stdout::
- Write the pack contents (what would have been writtin to
+ Write the pack contents (what would have been written to
.pack file) out to the standard output.
--window and --depth::
<p>You can query/set/replace/unset options with this command. The name is\r
actually the section and the key separated by a dot, and the value will be\r
escaped.</p>\r
-<p>If you want to set/unset an option which can occor on multiple lines, you\r
+<p>If you want to set/unset an option which can occur on multiple lines, you\r
should provide a POSIX regex for the value. If you want to handle the lines\r
-<strong>not</strong> matching the regex, just prepend a single exlamation mark in front\r
+<strong>not</strong> matching the regex, just prepend a single exclamation mark in front\r
(see EXAMPLES).</p>\r
<p>This command will fail if</p>\r
<ol>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:35 PDT\r
+Last updated 06-Jan-2006 17:12:42 PDT\r
</div>\r
</div>\r
</body>\r
actually the section and the key separated by a dot, and the value will be
escaped.
-If you want to set/unset an option which can occor on multiple lines, you
+If you want to set/unset an option which can occur on multiple lines, you
should provide a POSIX regex for the value. If you want to handle the lines
-*not* matching the regex, just prepend a single exlamation mark in front
+*not* matching the regex, just prepend a single exclamation mark in front
(see EXAMPLES).
This command will fail if
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-rev-list</em> [ --max-count=number ]\r
- [ --max-age=timestamp ]\r
- [ --min-age=timestamp ]\r
- [ --sparse ]\r
- [ --no-merges ]\r
- [ --all ]\r
- [ [ --merge-order [ --show-breaks ] ] | [ --topo-order ] | ]\r
- [ --parents ]\r
- [ --objects [ --unpacked ] ]\r
- [ --pretty | --header | ]\r
- [ --bisect ]\r
- <commit>… [ -- <paths>… ]</p>\r
+<div class="verseblock">\r
+<div class="content"><em>git-rev-list</em> [ --max-count=number ]\r
+ [ --max-age=timestamp ]\r
+ [ --min-age=timestamp ]\r
+ [ --sparse ]\r
+ [ --no-merges ]\r
+ [ --all ]\r
+ [ [ --merge-order [ --show-breaks ] ] | [ --topo-order ] ]\r
+ [ --parents ]\r
+ [ --objects [ --unpacked ] ]\r
+ [ --pretty | --header ]\r
+ [ --bisect ]\r
+ <commit>… [ -- <paths>… ]</div></div>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
the marked commit in the list.</p>\r
<p>Commits marked with (^) are not parents of the immediately preceding commit.\r
These "breaks" represent necessary discontinuities implied by trying to\r
-represent an arbtirary DAG in a linear form.</p>\r
+represent an arbitrary DAG in a linear form.</p>\r
<p><tt>--show-breaks</tt> is only valid if <tt>--merge-order</tt> is also specified.</p>\r
</dd>\r
</dl>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:38 PDT\r
+Last updated 06-Jan-2006 17:12:43 PDT\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
+[verse]
'git-rev-list' [ \--max-count=number ]
- [ \--max-age=timestamp ]
- [ \--min-age=timestamp ]
- [ \--sparse ]
- [ \--no-merges ]
- [ \--all ]
- [ [ \--merge-order [ \--show-breaks ] ] | [ \--topo-order ] | ]
- [ \--parents ]
- [ \--objects [ \--unpacked ] ]
- [ \--pretty | \--header | ]
- [ \--bisect ]
- <commit>... [ \-- <paths>... ]
+ [ \--max-age=timestamp ]
+ [ \--min-age=timestamp ]
+ [ \--sparse ]
+ [ \--no-merges ]
+ [ \--all ]
+ [ [ \--merge-order [ \--show-breaks ] ] | [ \--topo-order ] ]
+ [ \--parents ]
+ [ \--objects [ \--unpacked ] ]
+ [ \--pretty | \--header ]
+ [ \--bisect ]
+ <commit>... [ \-- <paths>... ]
DESCRIPTION
-----------
+
Commits marked with (^) are not parents of the immediately preceding commit.
These "breaks" represent necessary discontinuities implied by trying to
-represent an arbtirary DAG in a linear form.
+represent an arbitrary DAG in a linear form.
+
`--show-breaks` is only valid if `--merge-order` is also specified.
displayed, indented N places. If a commit is on the I-th\r
branch, the I-th indentation character shows a <em>+</em> sign;\r
otherwise it shows a space. Each commit shows a short name that\r
-can be used as an exended SHA1 to name that commit.</p>\r
+can be used as an extended SHA1 to name that commit.</p>\r
<p>The following example shows three branches, "master", "fixes"\r
and "mhf":</p>\r
<div class="listingblock">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:43 PDT\r
+Last updated 06-Jan-2006 17:12:45 PDT\r
</div>\r
</div>\r
</body>\r
displayed, indented N places. If a commit is on the I-th
branch, the I-th indentation character shows a '+' sign;
otherwise it shows a space. Each commit shows a short name that
-can be used as an exended SHA1 to name that commit.
+can be used as an extended SHA1 to name that commit.
The following example shows three branches, "master", "fixes"
and "mhf":
<div class="sectionbody">\r
<p><em>git-svnimport</em> [ -o <branch-for-HEAD> ] [ -h ] [ -v ] [ -d | -D ]\r
[ -C <GIT_repository> ] [ -i ] [ -u ] [-l limit_rev]\r
- [ -b branch_subdir ] [ -t trunk_subdir ] [ -T tag_subdir ]\r
+ [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ]\r
[ -s start_chg ] [ -m ] [ -M regex ]\r
<SVN_repository_URL> [ <path> ]</p>\r
</div>\r
<p>\r
Start importing at this SVN change number. The default is 1.\r
</p>\r
-<p>When importing incementally, you might need to edit the .git/svn2git file.</p>\r
+<p>When importing incrementally, you might need to edit the .git/svn2git file.</p>\r
</dd>\r
<dt>\r
-i\r
</p>\r
</dd>\r
<dt>\r
--t <trunk_subdir>\r
+-T <trunk_subdir>\r
</dt>\r
<dd>\r
<p>\r
</p>\r
</dd>\r
<dt>\r
--T <tag_subdir>\r
+-t <tag_subdir>\r
</dt>\r
<dd>\r
<p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:47 PDT\r
+Last updated 06-Jan-2006 17:12:46 PDT\r
</div>\r
</div>\r
</body>\r
--------
'git-svnimport' [ -o <branch-for-HEAD> ] [ -h ] [ -v ] [ -d | -D ]
[ -C <GIT_repository> ] [ -i ] [ -u ] [-l limit_rev]
- [ -b branch_subdir ] [ -t trunk_subdir ] [ -T tag_subdir ]
+ [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ]
[ -s start_chg ] [ -m ] [ -M regex ]
<SVN_repository_URL> [ <path> ]
-s <start_rev>::
Start importing at this SVN change number. The default is 1.
+
-When importing incementally, you might need to edit the .git/svn2git file.
+When importing incrementally, you might need to edit the .git/svn2git file.
-i::
Import-only: don't perform a checkout after importing. This option
ensures the working directory and index remain untouched and will
not create them if they do not exist.
--t <trunk_subdir>::
+-T <trunk_subdir>::
Name the SVN trunk. Default "trunk".
--T <tag_subdir>::
+-t <tag_subdir>::
Name the SVN subdirectory for tags. Default "tags".
-b <branch_subdir>::
</p>\r
</dd>\r
<dt>\r
-<a href="git-symbolic-refs.html">git-symbolic-refs(1)</a>\r
+<a href="git-symbolic-ref.html">git-symbolic-ref(1)</a>\r
</dt>\r
<dd>\r
<p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 18:31:54 PDT\r
+Last updated 06-Jan-2006 17:12:47 PDT\r
</div>\r
</div>\r
</body>\r
gitlink:git-send-email[1]::
Send patch e-mails out of "format-patch --mbox" output.
-gitlink:git-symbolic-refs[1]::
+gitlink:git-symbolic-ref[1]::
Read and modify symbolic refs.
gitlink:git-stripspace[1]::
</dt>\r
<dd>\r
<p>\r
- Stores a set of "objects", and an individial <a href="#ref_object">object</a> is\r
+ Stores a set of "objects", and an individual <a href="#ref_object">object</a> is\r
identified by its <a href="#ref_object_name">object name</a>. The objects usually\r
live in <tt>$GIT_DIR/objects/</tt>.\r
</p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:17:11 PDT\r
+Last updated 06-Jan-2006 17:13:01 PDT\r
</div>\r
</div>\r
</body>\r
In git's context, synonym to object name.
object database::
- Stores a set of "objects", and an individial object is identified
+ Stores a set of "objects", and an individual object is identified
by its object name. The objects usually live in `$GIT_DIR/objects/`.
blob object::
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:17:08 PDT\r
+Last updated 06-Jan-2006 17:12:58 PDT\r
</div>\r
</div>\r
</body>\r
git bisect bad master <- mark "master" as the bad state
git bisect good ORIG_HEAD <- mark ORIG_HEAD as good (or
whatever other known-good
- thing you booted laste)
+ thing you booted last)
and at this point "git bisect" will churn for a while, and tell you what
the mid-point between those two commits are, and check that state out as
You can be using <tt>objects/info/alternates</tt> mechanism, or\r
<tt>$GIT_ALTERNATE_OBJECT_DIRECTORIES</tt> mechanism to <em>borrow</em>\r
objects from other object stores. A repository with this kind\r
-of incompete object store is not suitable to be published for\r
+of incomplete object store is not suitable to be published for\r
use with dumb transports but otherwise is OK as long as\r
<tt>objects/info/alternates</tt> points at the right object stores\r
it borrows from.\r
up-to-date if the repository is published for dumb\r
transports. The <tt>git-receive-pack</tt> command, which is\r
run on a remote repository when you <tt>git push</tt> into it,\r
- runs <tt>hooks/update</tt> hook to help you achive this.\r
+ runs <tt>hooks/update</tt> hook to help you achieve this.\r
</p>\r
</dd>\r
<dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:17:09 PDT\r
+Last updated 06-Jan-2006 17:12:59 PDT\r
</div>\r
</div>\r
</body>\r
. You can be using `objects/info/alternates` mechanism, or
`$GIT_ALTERNATE_OBJECT_DIRECTORIES` mechanism to 'borrow'
objects from other object stores. A repository with this kind
-of incompete object store is not suitable to be published for
+of incomplete object store is not suitable to be published for
use with dumb transports but otherwise is OK as long as
`objects/info/alternates` points at the right object stores
it borrows from.
up-to-date if the repository is published for dumb
transports. The `git-receive-pack` command, which is
run on a remote repository when you `git push` into it,
- runs `hooks/update` hook to help you achive this.
+ runs `hooks/update` hook to help you achieve this.
info/grafts::
This file records fake commit ancestry information, to