* Documentation updates
* User manual updates
-
-
* Documentation updates
* User manual updates
-
-
- user-manual has better cross references.
- gitweb installation/deployment procedure is now documented.
-
description was given by the caller.
Also contains various documentation updates.
-
transfer.unpackLimit::
When `fetch.unpackLimit` or `receive.unpackLimit` are
not set, the value of this variable is used instead.
-
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:20 UTC\r
+Last updated 08-Jun-2007 16:08:42 UTC\r
</div>\r
</div>\r
</body>\r
often the best way of explaining what is going on.
In normal life, most people wouldn't use the "core" git programs
-directly, but rather script around them to make them more palatable.
+directly, but rather script around them to make them more palatable.
Understanding the core git stuff may help some people get those scripts
done, though, and it may also be instructive in helping people
understand what it is that the higher-level helper scripts are actually
-doing.
+doing.
The core git is often called "plumbing", with the prettier user
interfaces on top of it called "porcelain". You may not want to use the
out empty, and the only thing you need to do is find yourself a
subdirectory that you want to use as a working tree - either an empty
one for a totally new project, or an existing working tree that you want
-to import into git.
+to import into git.
For our first example, we're going to start a totally new repository from
scratch, with no pre-existing files, and we'll call it `git-tutorial`.
and see two files:
----------------
-.git/objects/55/7db03de997c86a4a028e1ebd3a1ceb225be238
+.git/objects/55/7db03de997c86a4a028e1ebd3a1ceb225be238
.git/objects/f2/4c74a2e500f5ee1332c86b94199f52b1d1d962
----------------
you've only *told* git about them.
However, since git knows about them, you can now start using some of the
-most basic git commands to manipulate the files or look at their status.
+most basic git commands to manipulate the files or look at their status.
In particular, let's not even check in the two files into git yet, we'll
start off by adding another line to `hello` first:
Remember how we did the `git-update-index` on file `hello` and then we
changed `hello` afterward, and could compare the new state of `hello` with the
-state we saved in the index file?
+state we saved in the index file?
Further, remember how I said that `git-write-tree` writes the contents
of the *index* file to the tree, and thus what we just committed was in
between a committed *tree* and either the index file or the working
tree. In other words, `git-diff-index` wants a tree to be diffed
against, and before we did the commit, we couldn't do that, because we
-didn't have anything to diff against.
+didn't have anything to diff against.
But now we can do
----------------
(where `-p` has the same meaning as it did in `git-diff-files`), and it
-will show us the same difference, but for a totally different reason.
+will show us the same difference, but for a totally different reason.
Now we're comparing the working tree not against the index file,
but against the tree we just wrote. It just so happens that those two
are obviously the same, so we get the same result.
instead compare against just the index cache contents, and ignore the
current working tree state entirely. Since we just wrote the index
file to HEAD, doing `git-diff-index \--cached -p HEAD` should thus return
-an empty set of differences, and that's exactly what it does.
+an empty set of differences, and that's exactly what it does.
[NOTE]
================
----------------
and you will see exactly what has changed in the repository over its
-short history.
+short history.
[NOTE]
The `\--root` flag is a flag to `git-diff-tree` to tell it to
the working tree that it describes" may not be technically 100%
accurate, but it's a good model for all normal use.
-This has two implications:
+This has two implications:
- if you grow bored with the tutorial repository you created (or you've
made a mistake and want to start all over), you can just do simple
the checked out files or even an index file, and will *only* contain the
actual core git files. Such a repository usually doesn't even have the
`.git` subdirectory, but has all the git files directly in the
-repository.
+repository.
To create your own local live copy of such a "raw" git repository, you'd
first create your own subdirectory for the project, and then copy the
$ rsync -rL rsync://rsync.kernel.org/pub/scm/git/git.git/ .git
----------------
-followed by
+followed by
----------------
$ git-read-tree HEAD
`-a` flag means "check out all files" (if you have a stale copy or an
older version of a checked out tree you may also need to add the `-f`
flag first, to tell git-checkout-index to *force* overwriting of any old
-files).
+files).
Again, this can all be simplified with
which will end up doing all of the above for you.
You have now successfully copied somebody else's (mine) remote
-repository, and checked it out.
+repository, and checked it out.
Creating a new branch
Branches in git are really nothing more than pointers into the git
object database from within the `.git/refs/` subdirectory, and as we
already discussed, the `HEAD` branch is nothing but a symlink to one of
-these object pointers.
+these object pointers.
You can at any time create a new branch by just picking an arbitrary
point in the project history, and just writing the SHA1 name of that
object into a file under `.git/refs/heads/`. You can use any filename you
want (and indeed, subdirectories), but the convention is that the
"normal" branch is called `master`. That's just a convention, though,
-and nothing enforces it.
+and nothing enforces it.
To show that as an example, let's go back to the git-tutorial repository we
used earlier, and create a branch in it. You do that by simply just
------------
will create a new branch based at the current `HEAD` position, and switch
-to it.
+to it.
[NOTE]
================================================
$ git branch <branchname> [startingpoint]
------------
-which will simply _create_ the branch, but will not do anything further.
+which will simply _create_ the branch, but will not do anything further.
You can then later -- once you decide that you want to actually develop
on that branch -- switch to that branch with a regular `git checkout`
with the branchname as the argument.
will show you graphically both of your branches (that's what the `\--all`
means: normally it will just show you your current `HEAD`) and their
histories. You can also see exactly how they came to be from a common
-source.
+source.
Anyway, let's exit `gitk` (`^Q` or the File menu), and decide that we want
to merge the work we did on the `mybranch` branch into the `master`
file, which had no differences in the `mybranch` branch), and say:
----------------
- Auto-merging hello
- CONFLICT (content): Merge conflict in hello
+ Auto-merging hello
+ CONFLICT (content): Merge conflict in hello
Automatic merge failed; fix up by hand
----------------
propagation to other publicly visible machines:
------------
-$ git push master.kernel.org:/pub/scm/git/git.git/
+$ git push master.kernel.org:/pub/scm/git/git.git/
------------
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:20 UTC\r
+Last updated 08-Jun-2007 16:08:43 UTC\r
</div>\r
</div>\r
</body>\r
The output format from "git-diff-index", "git-diff-tree" and
"git-diff-files" are very similar.
-These commands all compare two sets of things; what is
+These commands all compare two sets of things; what is
compared differs:
git-diff-index <tree-ish>::
--- a/describe.c
+++ b/describe.c
@@@ -98,20 -98,12 +98,20 @@@
- return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
+ return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
}
-
+
- static void describe(char *arg)
-static void describe(struct commit *cmit, int last_one)
++static void describe(char *arg, int last_one)
{
+ unsigned char sha1[20];
+ struct commit *cmit;
- struct commit_list *list;
- static int initialized = 0;
- struct commit_name *n;
-
+ struct commit_list *list;
+ static int initialized = 0;
+ struct commit_name *n;
+
+ if (get_sha1(arg, sha1) < 0)
+ usage(describe_usage);
+ cmit = lookup_commit_reference(sha1);
+ if (!cmit)
+ usage(describe_usage);
+
- if (!initialized) {
- initialized = 1;
- for_each_ref(get_name);
+ if (!initialized) {
+ initialized = 1;
+ for_each_ref(get_name);
------------
1. It is preceded with a "git diff" header, that looks like
two unresolved merge parents with the working tree file
(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
"their version").
-
that matches other criteria, nothing is selected.
--find-copies-harder::
- For performance reasons, by default, -C option finds copies only
- if the original file of the copy was modified in the same
+ For performance reasons, by default, -C option finds copies only
+ if the original file of the copy was modified in the same
changeset. This flag makes the command
inspect unmodified files as candidates for the source of
copy. This is a very expensive operation for large
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:21 UTC\r
+Last updated 08-Jun-2007 16:08:43 UTC\r
</div>\r
</div>\r
</body>\r
is controlled by giving the pathname parameters to the
git-diff-* commands on the command line. The pathspec is used
to limit the world diff operates in. It removes the filepairs
-outside the specified set of pathnames. E.g. If the input set
+outside the specified set of pathnames. E.g. If the input set
of filepairs included:
------------------------------------------------
*.c
t
------------------------------------------------
-
-/*\r
- CSS stylesheet for XHTML produced by DocBook XSL stylesheets.\r
- Tested with XSL stylesheets 1.61.2, 1.67.2\r
-*/\r
-\r
-span.strong {\r
- font-weight: bold;\r
-}\r
-\r
-body blockquote {\r
- margin-top: .75em;\r
- line-height: 1.5;\r
- margin-bottom: .75em;\r
-}\r
-\r
-html body {\r
- margin: 1em 5% 1em 5%;\r
- line-height: 1.2;\r
-}\r
-\r
-body div {\r
- margin: 0;\r
-}\r
-\r
-h1, h2, h3, h4, h5, h6,\r
-div.toc p b,\r
-div.list-of-figures p b,\r
-div.list-of-tables p b,\r
-div.abstract p.title\r
-{\r
- color: #527bbd;\r
- font-family: tahoma, verdana, sans-serif;\r
-}\r
-\r
-div.toc p:first-child,\r
-div.list-of-figures p:first-child,\r
-div.list-of-tables p:first-child,\r
-div.example p.title\r
-{\r
- margin-bottom: 0.2em;\r
-}\r
-\r
-body h1 {\r
- margin: .0em 0 0 -4%;\r
- line-height: 1.3;\r
- border-bottom: 2px solid silver;\r
-}\r
-\r
-body h2 {\r
- margin: 0.5em 0 0 -4%;\r
- line-height: 1.3;\r
- border-bottom: 2px solid silver;\r
-}\r
-\r
-body h3 {\r
- margin: .8em 0 0 -3%;\r
- line-height: 1.3;\r
-}\r
-\r
-body h4 {\r
- margin: .8em 0 0 -3%;\r
- line-height: 1.3;\r
-}\r
-\r
-body h5 {\r
- margin: .8em 0 0 -2%;\r
- line-height: 1.3;\r
-}\r
-\r
-body h6 {\r
- margin: .8em 0 0 -1%;\r
- line-height: 1.3;\r
-}\r
-\r
-body hr {\r
- border: none; /* Broken on IE6 */\r
-}\r
-div.footnotes hr {\r
- border: 1px solid silver;\r
-}\r
-\r
-div.navheader th, div.navheader td, div.navfooter td {\r
- font-family: sans-serif;\r
- font-size: 0.9em;\r
- font-weight: bold;\r
- color: #527bbd;\r
-}\r
-div.navheader img, div.navfooter img {\r
- border-style: none;\r
-}\r
-div.navheader a, div.navfooter a {\r
- font-weight: normal;\r
-}\r
-div.navfooter hr {\r
- border: 1px solid silver;\r
-}\r
-\r
-body td {\r
- line-height: 1.2\r
-}\r
-\r
-body th {\r
- line-height: 1.2;\r
-}\r
-\r
-ol {\r
- line-height: 1.2;\r
-}\r
-\r
-ul, body dir, body menu {\r
- line-height: 1.2;\r
-}\r
-\r
-html {\r
- margin: 0; \r
- padding: 0;\r
-}\r
-\r
-body h1, body h2, body h3, body h4, body h5, body h6 {\r
- margin-left: 0\r
-} \r
-\r
-body pre {\r
- margin: 0.5em 10% 0.5em 1em;\r
- line-height: 1.0;\r
- color: navy;\r
-}\r
-\r
-tt.literal, code.literal {\r
- color: navy;\r
-}\r
-\r
-div.literallayout p {\r
- padding: 0em;\r
- margin: 0em;\r
-}\r
-\r
-div.literallayout {\r
- font-family: monospace;\r
-# margin: 0.5em 10% 0.5em 1em;\r
- margin: 0em;\r
- color: navy;\r
- border: 1px solid silver;\r
- background: #f4f4f4;\r
- padding: 0.5em;\r
-}\r
-\r
-.programlisting, .screen {\r
- border: 1px solid silver;\r
- background: #f4f4f4;\r
- margin: 0.5em 10% 0.5em 0;\r
- padding: 0.5em 1em;\r
-}\r
-\r
-div.sidebar {\r
- background: #ffffee;\r
- margin: 1.0em 10% 0.5em 0;\r
- padding: 0.5em 1em;\r
- border: 1px solid silver;\r
-}\r
-div.sidebar * { padding: 0; }\r
-div.sidebar div { margin: 0; }\r
-div.sidebar p.title {\r
- font-family: sans-serif;\r
- margin-top: 0.5em;\r
- margin-bottom: 0.2em;\r
-}\r
-\r
-div.bibliomixed {\r
- margin: 0.5em 5% 0.5em 1em;\r
-}\r
-\r
-div.glossary dt {\r
- font-weight: bold;\r
-}\r
-div.glossary dd p {\r
- margin-top: 0.2em;\r
-}\r
-\r
-dl {\r
- margin: .8em 0;\r
- line-height: 1.2;\r
-}\r
-\r
-dt {\r
- margin-top: 0.5em;\r
-}\r
-\r
-dt span.term {\r
- font-style: italic;\r
-}\r
-\r
-div.variablelist dd p {\r
- margin-top: 0;\r
-}\r
-\r
-div.itemizedlist li, div.orderedlist li {\r
- margin-left: -0.8em;\r
- margin-top: 0.5em;\r
-}\r
-\r
-ul, ol {\r
- list-style-position: outside;\r
-}\r
-\r
-div.sidebar ul, div.sidebar ol {\r
- margin-left: 2.8em;\r
-}\r
-\r
-div.itemizedlist p.title,\r
-div.orderedlist p.title,\r
-div.variablelist p.title\r
-{\r
- margin-bottom: -0.8em;\r
-}\r
-\r
-div.revhistory table {\r
- border-collapse: collapse;\r
- border: none;\r
-}\r
-div.revhistory th {\r
- border: none;\r
- color: #527bbd;\r
- font-family: tahoma, verdana, sans-serif;\r
-}\r
-div.revhistory td {\r
- border: 1px solid silver;\r
-}\r
-\r
-/* Keep TOC and index lines close together. */\r
-div.toc dl, div.toc dt,\r
-div.list-of-figures dl, div.list-of-figures dt,\r
-div.list-of-tables dl, div.list-of-tables dt,\r
-div.indexdiv dl, div.indexdiv dt\r
-{\r
- line-height: normal;\r
- margin-top: 0;\r
- margin-bottom: 0;\r
-}\r
-\r
-/*\r
- Table styling does not work because of overriding attributes in\r
- generated HTML.\r
-*/\r
-div.table table,\r
-div.informaltable table\r
-{\r
- margin-left: 0;\r
- margin-right: 5%;\r
- margin-bottom: 0.8em;\r
-}\r
-div.informaltable table\r
-{\r
- margin-top: 0.4em\r
-}\r
-div.table thead,\r
-div.table tfoot,\r
-div.table tbody,\r
-div.informaltable thead,\r
-div.informaltable tfoot,\r
-div.informaltable tbody\r
-{\r
- /* No effect in IE6. */\r
- border-top: 2px solid #527bbd;\r
- border-bottom: 2px solid #527bbd;\r
-}\r
-div.table thead, div.table tfoot,\r
-div.informaltable thead, div.informaltable tfoot\r
-{\r
- font-weight: bold;\r
-}\r
-\r
-div.mediaobject img {\r
- border: 1px solid silver;\r
- margin-bottom: 0.8em;\r
-}\r
-div.figure p.title,\r
-div.table p.title\r
-{\r
- margin-top: 1em;\r
- margin-bottom: 0.4em;\r
-}\r
-\r
-@media print {\r
- div.navheader, div.navfooter { display: none; }\r
-}\r
+/*
+ CSS stylesheet for XHTML produced by DocBook XSL stylesheets.
+ Tested with XSL stylesheets 1.61.2, 1.67.2
+*/
+
+span.strong {
+ font-weight: bold;
+}
+
+body blockquote {
+ margin-top: .75em;
+ line-height: 1.5;
+ margin-bottom: .75em;
+}
+
+html body {
+ margin: 1em 5% 1em 5%;
+ line-height: 1.2;
+}
+
+body div {
+ margin: 0;
+}
+
+h1, h2, h3, h4, h5, h6,
+div.toc p b,
+div.list-of-figures p b,
+div.list-of-tables p b,
+div.abstract p.title
+{
+ color: #527bbd;
+ font-family: tahoma, verdana, sans-serif;
+}
+
+div.toc p:first-child,
+div.list-of-figures p:first-child,
+div.list-of-tables p:first-child,
+div.example p.title
+{
+ margin-bottom: 0.2em;
+}
+
+body h1 {
+ margin: .0em 0 0 -4%;
+ line-height: 1.3;
+ border-bottom: 2px solid silver;
+}
+
+body h2 {
+ margin: 0.5em 0 0 -4%;
+ line-height: 1.3;
+ border-bottom: 2px solid silver;
+}
+
+body h3 {
+ margin: .8em 0 0 -3%;
+ line-height: 1.3;
+}
+
+body h4 {
+ margin: .8em 0 0 -3%;
+ line-height: 1.3;
+}
+
+body h5 {
+ margin: .8em 0 0 -2%;
+ line-height: 1.3;
+}
+
+body h6 {
+ margin: .8em 0 0 -1%;
+ line-height: 1.3;
+}
+
+body hr {
+ border: none; /* Broken on IE6 */
+}
+div.footnotes hr {
+ border: 1px solid silver;
+}
+
+div.navheader th, div.navheader td, div.navfooter td {
+ font-family: sans-serif;
+ font-size: 0.9em;
+ font-weight: bold;
+ color: #527bbd;
+}
+div.navheader img, div.navfooter img {
+ border-style: none;
+}
+div.navheader a, div.navfooter a {
+ font-weight: normal;
+}
+div.navfooter hr {
+ border: 1px solid silver;
+}
+
+body td {
+ line-height: 1.2
+}
+
+body th {
+ line-height: 1.2;
+}
+
+ol {
+ line-height: 1.2;
+}
+
+ul, body dir, body menu {
+ line-height: 1.2;
+}
+
+html {
+ margin: 0;
+ padding: 0;
+}
+
+body h1, body h2, body h3, body h4, body h5, body h6 {
+ margin-left: 0
+}
+
+body pre {
+ margin: 0.5em 10% 0.5em 1em;
+ line-height: 1.0;
+ color: navy;
+}
+
+tt.literal, code.literal {
+ color: navy;
+}
+
+div.literallayout p {
+ padding: 0em;
+ margin: 0em;
+}
+
+div.literallayout {
+ font-family: monospace;
+# margin: 0.5em 10% 0.5em 1em;
+ margin: 0em;
+ color: navy;
+ border: 1px solid silver;
+ background: #f4f4f4;
+ padding: 0.5em;
+}
+
+.programlisting, .screen {
+ border: 1px solid silver;
+ background: #f4f4f4;
+ margin: 0.5em 10% 0.5em 0;
+ padding: 0.5em 1em;
+}
+
+div.sidebar {
+ background: #ffffee;
+ margin: 1.0em 10% 0.5em 0;
+ padding: 0.5em 1em;
+ border: 1px solid silver;
+}
+div.sidebar * { padding: 0; }
+div.sidebar div { margin: 0; }
+div.sidebar p.title {
+ font-family: sans-serif;
+ margin-top: 0.5em;
+ margin-bottom: 0.2em;
+}
+
+div.bibliomixed {
+ margin: 0.5em 5% 0.5em 1em;
+}
+
+div.glossary dt {
+ font-weight: bold;
+}
+div.glossary dd p {
+ margin-top: 0.2em;
+}
+
+dl {
+ margin: .8em 0;
+ line-height: 1.2;
+}
+
+dt {
+ margin-top: 0.5em;
+}
+
+dt span.term {
+ font-style: italic;
+}
+
+div.variablelist dd p {
+ margin-top: 0;
+}
+
+div.itemizedlist li, div.orderedlist li {
+ margin-left: -0.8em;
+ margin-top: 0.5em;
+}
+
+ul, ol {
+ list-style-position: outside;
+}
+
+div.sidebar ul, div.sidebar ol {
+ margin-left: 2.8em;
+}
+
+div.itemizedlist p.title,
+div.orderedlist p.title,
+div.variablelist p.title
+{
+ margin-bottom: -0.8em;
+}
+
+div.revhistory table {
+ border-collapse: collapse;
+ border: none;
+}
+div.revhistory th {
+ border: none;
+ color: #527bbd;
+ font-family: tahoma, verdana, sans-serif;
+}
+div.revhistory td {
+ border: 1px solid silver;
+}
+
+/* Keep TOC and index lines close together. */
+div.toc dl, div.toc dt,
+div.list-of-figures dl, div.list-of-figures dt,
+div.list-of-tables dl, div.list-of-tables dt,
+div.indexdiv dl, div.indexdiv dt
+{
+ line-height: normal;
+ margin-top: 0;
+ margin-bottom: 0;
+}
+
+/*
+ Table styling does not work because of overriding attributes in
+ generated HTML.
+*/
+div.table table,
+div.informaltable table
+{
+ margin-left: 0;
+ margin-right: 5%;
+ margin-bottom: 0.8em;
+}
+div.informaltable table
+{
+ margin-top: 0.4em
+}
+div.table thead,
+div.table tfoot,
+div.table tbody,
+div.informaltable thead,
+div.informaltable tfoot,
+div.informaltable tbody
+{
+ /* No effect in IE6. */
+ border-top: 2px solid #527bbd;
+ border-bottom: 2px solid #527bbd;
+}
+div.table thead, div.table tfoot,
+div.informaltable thead, div.informaltable tfoot
+{
+ font-weight: bold;
+}
+
+div.mediaobject img {
+ border: 1px solid silver;
+ margin-bottom: 0.8em;
+}
+div.figure p.title,
+div.table p.title
+{
+ margin-top: 1em;
+ margin-bottom: 0.4em;
+}
+
+@media print {
+ div.navheader, div.navfooter { display: none; }
+}
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:22 UTC\r
+Last updated 08-Jun-2007 16:08:44 UTC\r
</div>\r
</div>\r
</body>\r
Deepen the history of a 'shallow' repository created by
`git clone` with `--depth=<depth>` option (see gitlink:git-clone[1])
by the specified number of commits.
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:21 UTC\r
+Last updated 08-Jun-2007 16:07:59 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Jun-2007 08:39:37 UTC\r
+Last updated 08-Jun-2007 16:07:59 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:22 UTC\r
+Last updated 08-Jun-2007 16:08:00 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:23 UTC\r
+Last updated 08-Jun-2007 16:08:00 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:24 UTC\r
+Last updated 08-Jun-2007 16:08:00 UTC\r
</div>\r
</div>\r
</body>\r
Imports a project from one or more Arch repositories. It will follow branches
and repositories within the namespaces defined by the <archive/branch>
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).
+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).
-The script expects you to provide the key roots where it can start the import
-from an 'initial import' or 'tag' type of Arch commit. It will follow and
-import new branches within the provided roots.
+The script expects you to provide the key roots where it can start the import
+from an 'initial import' or 'tag' type of Arch commit. It will follow and
+import new branches within the provided roots.
-It expects to be dealing with one project only. If it sees
-branches that have different roots, it will refuse to run. In that case,
-edit your <archive/branch> parameters to define clearly the scope of the
-import.
+It expects to be dealing with one project only. If it sees
+branches that have different roots, it will refuse to run. In that case,
+edit your <archive/branch> parameters to define clearly the scope of the
+import.
-`git-archimport` uses `tla` extensively in the background to access the
+`git-archimport` uses `tla` extensively in the background to access the
Arch repository.
Make sure you have a recent version of `tla` available in the path. `tla` must
-know about the repositories you pass to `git-archimport`.
+know about the repositories you pass to `git-archimport`.
-For the initial import `git-archimport` expects to find itself in an empty
-directory. To follow the development of a project that uses Arch, rerun
-`git-archimport` with the same parameters as the initial import to perform
+For the initial import `git-archimport` expects to find itself in an empty
+directory. To follow the development of a project that uses Arch, rerun
+`git-archimport` with the same parameters as the initial import to perform
incremental imports.
While git-archimport will try to create sensible branch names for the
MERGES
------
-Patch merge data from Arch is used to mark merges in git as well. git
+Patch merge data from Arch is used to mark merges in git as well. git
does not care much about tracking patches, and only considers a merge when a
branch incorporates all the commits since the point they forked. The end result
-is that git will have a good idea of how far branches have diverged. So the
+is that git will have a good idea of how far branches have diverged. So the
import process does lose some patch-trading metadata.
-Fortunately, when you try and merge branches imported from Arch,
-git will find a good merge base, and it has a good chance of identifying
-patches that have been traded out-of-sequence between the branches.
+Fortunately, when you try and merge branches imported from Arch,
+git will find a good merge base, and it has a good chance of identifying
+patches that have been traded out-of-sequence between the branches.
OPTIONS
-------
Display usage.
-v::
- Verbose output.
+ Verbose output.
-T::
- Many tags. Will create a tag for every commit, reflecting the commit
+ Many tags. Will create a tag for every commit, reflecting the commit
name in the Arch repository.
-f::
<archive/branch>::
- Archive/branch identifier in a format that `tla log` understands.
+ Archive/branch identifier in a format that `tla log` understands.
Author
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:24 UTC\r
+Last updated 08-Jun-2007 16:08:01 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:24 UTC\r
+Last updated 08-Jun-2007 16:08:01 UTC\r
</div>\r
</div>\r
</body>\r
SYNOPSIS
--------
-'git bisect' <subcommand> <options>
+'git bisect' <subcommand> <options>
DESCRIPTION
-----------
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:24 UTC\r
+Last updated 08-Jun-2007 16:08:01 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:25 UTC\r
+Last updated 08-Jun-2007 16:08:02 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:25 UTC\r
+Last updated 08-Jun-2007 16:08:02 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:26 UTC\r
+Last updated 08-Jun-2007 16:08:02 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:26 UTC\r
+Last updated 08-Jun-2007 16:08:02 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:27 UTC\r
+Last updated 08-Jun-2007 16:08:03 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:26 UTC\r
+Last updated 08-Jun-2007 16:08:03 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:27 UTC\r
+Last updated 08-Jun-2007 16:08:03 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:27 UTC\r
+Last updated 08-Jun-2007 16:08:03 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:28 UTC\r
+Last updated 08-Jun-2007 16:08:04 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:28 UTC\r
+Last updated 08-Jun-2007 16:08:04 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:28 UTC\r
+Last updated 08-Jun-2007 16:08:04 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:28 UTC\r
+Last updated 08-Jun-2007 16:08:04 UTC\r
</div>\r
</div>\r
</body>\r
-p <parent commit>::
Each '-p' indicates the id of a parent commit object.
-
+
Commit Information
------------------
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:29 UTC\r
+Last updated 08-Jun-2007 16:08:04 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:29 UTC\r
+Last updated 08-Jun-2007 16:08:05 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:29 UTC\r
+Last updated 08-Jun-2007 16:08:05 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:30 UTC\r
+Last updated 08-Jun-2007 16:08:05 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:30 UTC\r
+Last updated 08-Jun-2007 16:08:06 UTC\r
</div>\r
</div>\r
</body>\r
DESCRIPTION
-----------
Exports a commit from GIT to a CVS checkout, making it easier
-to merge patches from a git repository into a CVS repository.
+to merge patches from a git repository into a CVS repository.
-Execute it from the root of the CVS working copy. GIT_DIR must be defined.
+Execute it from the root of the CVS working copy. GIT_DIR must be defined.
See examples below.
-It does its best to do the safe thing, it will check that the files are
-unchanged and up to date in the CVS checkout, and it will not autocommit
+It does its best to do the safe thing, it will check that the files are
+unchanged and up to date in the CVS checkout, and it will not autocommit
by default.
Supports file additions, removals, and commits that affect binary files.
If the commit is a merge commit, you must tell git-cvsexportcommit what parent
-should the changeset be done against.
+should the changeset be done against.
OPTIONS
-------
Force the parent commit, even if it is not a direct parent.
-m::
- Prepend the commit message with the provided prefix.
+ Prepend the commit message with the provided prefix.
Useful for patch series and the like.
-u::
$ export GIT_DIR=~/project/.git
$ cd ~/project_cvs_checkout
$ git-cvsexportcommit -v <commit-sha1>
-$ cvs commit -F .mgs <files>
+$ cvs commit -F .mgs <files>
------------
Merge pending patches into CVS automatically -- only if you really know what you are doing ::
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:30 UTC\r
+Last updated 08-Jun-2007 16:08:06 UTC\r
</div>\r
</div>\r
</body>\r
-d <CVSROOT>::
The root of the CVS archive. May be local (a simple path) or remote;
- currently, only the :local:, :ext: and :pserver: access methods
+ currently, only the :local:, :ext: and :pserver: access methods
are supported. If not given, git-cvsimport will try to read it
from `CVS/Root`. If no such file exists, it checks for the
`CVSROOT` environment variable.
-k::
Kill keywords: will extract files with '-kk' from the CVS archive
to avoid noisy changesets. Highly recommended, but off by default
- to preserve compatibility with early imported trees.
+ to preserve compatibility with early imported trees.
-u::
Convert underscores in tag and branch names to dots.
Instead of calling cvsps, read the provided cvsps output file. Useful
for debugging or when cvsps is being handled outside cvsimport.
--m::
+-m::
Attempt to detect merges based on the commit message. This option
- will enable default regexes that try to capture the name source
- branch name from the commit message.
+ will enable default regexes that try to capture the name source
+ branch name from the commit message.
-M <regex>::
Attempt to detect merges based on the commit message with a custom
regex. It can be used with '-m' to also see the default regexes.
- You must escape forward slashes.
+ You must escape forward slashes.
-S <regex>::
Skip paths matching the regex.
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:31 UTC\r
+Last updated 08-Jun-2007 16:08:07 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:32 UTC\r
+Last updated 08-Jun-2007 16:08:07 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:32 UTC\r
+Last updated 08-Jun-2007 16:08:07 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:33 UTC\r
+Last updated 08-Jun-2007 16:08:07 UTC\r
</div>\r
</div>\r
</body>\r
branch" respectively. With these options, diffs for
merged entries are not shown.
+
-The default is to diff against our branch (-2) and the
+The default is to diff against our branch (-2) and the
cleanly resolved paths. The option -0 can be given to
omit diff output for unmerged entries and just show "Unmerged".
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:33 UTC\r
+Last updated 08-Jun-2007 16:08:08 UTC\r
</div>\r
</div>\r
</body>\r
nicer for the case where you just want to check where you are.
So doing a "git-diff-index --cached" is basically very useful when you are
-asking yourself "what have I already marked for being committed, and
+asking yourself "what have I already marked for being committed, and
what's the difference to a previous tree".
Non-cached Mode
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:34 UTC\r
+Last updated 08-Jun-2007 16:08:08 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:35 UTC\r
+Last updated 08-Jun-2007 16:08:09 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:36 UTC\r
+Last updated 08-Jun-2007 16:08:10 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:36 UTC\r
+Last updated 08-Jun-2007 16:08:10 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:37 UTC\r
+Last updated 08-Jun-2007 16:08:11 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:38 UTC\r
+Last updated 08-Jun-2007 16:08:11 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:38 UTC\r
+Last updated 08-Jun-2007 16:08:11 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 06-Jun-2007 10:48:13 UTC\r
+Last updated 08-Jun-2007 16:08:12 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:40 UTC\r
+Last updated 08-Jun-2007 16:08:12 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 05-Jun-2007 09:01:07 UTC\r
+Last updated 08-Jun-2007 16:08:12 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:41 UTC\r
+Last updated 08-Jun-2007 16:08:13 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:41 UTC\r
+Last updated 08-Jun-2007 16:08:13 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:41 UTC\r
+Last updated 08-Jun-2007 16:08:14 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:42 UTC\r
+Last updated 08-Jun-2007 16:08:13 UTC\r
</div>\r
</div>\r
</body>\r
object database. Reports its object ID to its standard output.
This is used by "git-cvsimport" to update the index
without modifying files in the work tree. When <type> is not
-specified, it defaults to "blob".
+specified, it defaults to "blob".
OPTIONS
-------
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:41 UTC\r
+Last updated 08-Jun-2007 16:08:14 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:42 UTC\r
+Last updated 08-Jun-2007 16:08:14 UTC\r
</div>\r
</div>\r
</body>\r
A '<ref>' specification can be either a single pattern, or a pair
of such patterns separated by a colon ":" (this means that a ref name
-cannot have a colon in it). A single pattern '<name>' is just a
+cannot have a colon in it). A single pattern '<name>' is just a
shorthand for '<name>:<name>'.
Each pattern pair consists of the source side (before the colon)
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:42 UTC\r
+Last updated 08-Jun-2007 16:08:14 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:43 UTC\r
+Last updated 08-Jun-2007 16:08:15 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:42 UTC\r
+Last updated 08-Jun-2007 16:08:15 UTC\r
</div>\r
</div>\r
</body>\r
This is a synonym for gitlink:git-init[1]. Please refer to the
documentation of that command.
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:43 UTC\r
+Last updated 08-Jun-2007 16:08:15 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:43 UTC\r
+Last updated 08-Jun-2007 16:08:15 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:44 UTC\r
+Last updated 08-Jun-2007 16:08:16 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:44 UTC\r
+Last updated 08-Jun-2007 16:08:16 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:44 UTC\r
+Last updated 08-Jun-2007 16:08:16 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:44 UTC\r
+Last updated 08-Jun-2007 16:08:16 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:45 UTC\r
+Last updated 08-Jun-2007 16:08:17 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:45 UTC\r
+Last updated 08-Jun-2007 16:08:17 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Jun-2007 08:39:36 UTC\r
+Last updated 08-Jun-2007 16:08:17 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:45 UTC\r
+Last updated 08-Jun-2007 16:08:17 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:46 UTC\r
+Last updated 08-Jun-2007 16:08:17 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:46 UTC\r
+Last updated 08-Jun-2007 16:08:18 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:46 UTC\r
+Last updated 08-Jun-2007 16:08:18 UTC\r
</div>\r
</div>\r
</body>\r
This is modified MM in the branch B. # merge2
This is modified MM in the branch B. # current contents
-or
+or
torvalds@ppc970:~/merge-test> git-merge-index cat AA MM
cat: : No such file or directory
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:47 UTC\r
+Last updated 08-Jun-2007 16:08:18 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:47 UTC\r
+Last updated 08-Jun-2007 16:08:18 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:48 UTC\r
+Last updated 08-Jun-2007 16:08:19 UTC\r
</div>\r
</div>\r
</body>\r
1. the results are updated both in the index file and in your
working tree,
2. index file is written out as a tree,
-3. the tree gets committed, and
+3. the tree gets committed, and
4. the `HEAD` pointer gets advanced.
Because of 2., we require that the original state of the index
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:47 UTC\r
+Last updated 08-Jun-2007 16:08:19 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:48 UTC\r
+Last updated 08-Jun-2007 16:08:20 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:51 UTC\r
+Last updated 08-Jun-2007 16:08:19 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:50 UTC\r
+Last updated 08-Jun-2007 16:08:20 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:51 UTC\r
+Last updated 08-Jun-2007 16:08:20 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:52 UTC\r
+Last updated 08-Jun-2007 16:08:21 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:51 UTC\r
+Last updated 08-Jun-2007 16:08:21 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:52 UTC\r
+Last updated 08-Jun-2007 16:08:22 UTC\r
</div>\r
</div>\r
</body>\r
'xargs rm' if you are in the root of the repository.
git-pack-redundant accepts a list of objects on standard input. Any objects
-given will be ignored when checking which packs are required. This makes the
+given will be ignored when checking which packs are required. This makes the
following command useful when wanting to remove packs which contain unreachable
objects.
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:52 UTC\r
+Last updated 08-Jun-2007 16:08:22 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:53 UTC\r
+Last updated 08-Jun-2007 16:08:22 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:53 UTC\r
+Last updated 08-Jun-2007 16:08:22 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:53 UTC\r
+Last updated 08-Jun-2007 16:08:23 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:54 UTC\r
+Last updated 08-Jun-2007 16:08:23 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:54 UTC\r
+Last updated 08-Jun-2007 16:08:24 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:54 UTC\r
+Last updated 08-Jun-2007 16:08:24 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:54 UTC\r
+Last updated 08-Jun-2007 16:08:24 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:55 UTC\r
+Last updated 08-Jun-2007 16:08:25 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:55 UTC\r
+Last updated 08-Jun-2007 16:08:25 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:55 UTC\r
+Last updated 08-Jun-2007 16:08:26 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:09:59 UTC\r
+Last updated 08-Jun-2007 16:08:26 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:01 UTC\r
+Last updated 08-Jun-2007 16:08:26 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:02 UTC\r
+Last updated 08-Jun-2007 16:08:27 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:02 UTC\r
+Last updated 08-Jun-2007 16:08:27 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:04 UTC\r
+Last updated 08-Jun-2007 16:08:27 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:04 UTC\r
+Last updated 08-Jun-2007 16:08:28 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:05 UTC\r
+Last updated 08-Jun-2007 16:08:28 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:05 UTC\r
+Last updated 08-Jun-2007 16:08:28 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:06 UTC\r
+Last updated 08-Jun-2007 16:08:28 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:07 UTC\r
+Last updated 08-Jun-2007 16:08:28 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:08 UTC\r
+Last updated 08-Jun-2007 16:08:29 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:07 UTC\r
+Last updated 08-Jun-2007 16:08:29 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:10 UTC\r
+Last updated 08-Jun-2007 16:08:30 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:10 UTC\r
+Last updated 08-Jun-2007 16:08:30 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:11 UTC\r
+Last updated 08-Jun-2007 16:08:30 UTC\r
</div>\r
</div>\r
</body>\r
`localhost` otherwise.
--subject::
- Specify the initial subject of the email thread.
+ Specify the initial subject of the email thread.
Only necessary if --compose is also set. If --compose
is not set, this will be prompted for.
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:11 UTC\r
+Last updated 08-Jun-2007 16:08:31 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:13 UTC\r
+Last updated 08-Jun-2007 16:08:31 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:11 UTC\r
+Last updated 08-Jun-2007 16:08:31 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:12 UTC\r
+Last updated 08-Jun-2007 16:08:32 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:12 UTC\r
+Last updated 08-Jun-2007 16:08:32 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:12 UTC\r
+Last updated 08-Jun-2007 16:08:32 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:12 UTC\r
+Last updated 08-Jun-2007 16:08:32 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:13 UTC\r
+Last updated 08-Jun-2007 16:08:33 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:13 UTC\r
+Last updated 08-Jun-2007 16:08:33 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:13 UTC\r
+Last updated 08-Jun-2007 16:08:33 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:13 UTC\r
+Last updated 08-Jun-2007 16:08:34 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:14 UTC\r
+Last updated 08-Jun-2007 16:08:34 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Jun-2007 08:39:37 UTC\r
+Last updated 08-Jun-2007 16:08:34 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:14 UTC\r
+Last updated 08-Jun-2007 16:08:34 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:14 UTC\r
+Last updated 08-Jun-2007 16:08:35 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:14 UTC\r
+Last updated 08-Jun-2007 16:08:35 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 06-Jun-2007 10:48:13 UTC\r
+Last updated 08-Jun-2007 16:08:35 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:15 UTC\r
+Last updated 08-Jun-2007 16:08:36 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:22 UTC\r
+Last updated 08-Jun-2007 16:08:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:15 UTC\r
+Last updated 08-Jun-2007 16:08:36 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 07-Jun-2007 01:21:16 UTC\r
+Last updated 08-Jun-2007 16:08:36 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:15 UTC\r
+Last updated 08-Jun-2007 16:08:37 UTC\r
</div>\r
</div>\r
</body>\r
--unmerged::
If --refresh finds unmerged changes in the index, the default
- behavior is to error out. This option makes git-update-index
+ behavior is to error out. This option makes git-update-index
continue anyway.
--ignore-missing::
--cacheinfo <mode> <object> <path>::
Directly insert the specified info into the index.
-
+
--index-info::
Read index information from stdin.
--chmod=(+|-)x::
- Set the execute permissions on the updated files.
+ Set the execute permissions on the updated files.
--assume-unchanged, --no-assume-unchanged::
When these flags are specified, the object name recorded
<file>::
Files to act on.
Note that files beginning with '.' are discarded. This includes
- `./file` and `dir/./file`. If you don't want this, then use
+ `./file` and `dir/./file`. If you don't want this, then use
cleaner names.
The same applies to directories ending '/' and paths with '//'
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:16 UTC\r
+Last updated 08-Jun-2007 16:08:37 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:16 UTC\r
+Last updated 08-Jun-2007 16:08:37 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:16 UTC\r
+Last updated 08-Jun-2007 16:08:37 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:16 UTC\r
+Last updated 08-Jun-2007 16:08:38 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:16 UTC\r
+Last updated 08-Jun-2007 16:08:38 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:17 UTC\r
+Last updated 08-Jun-2007 16:08:38 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:17 UTC\r
+Last updated 08-Jun-2007 16:08:38 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:17 UTC\r
+Last updated 08-Jun-2007 16:08:38 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:17 UTC\r
+Last updated 08-Jun-2007 16:08:39 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Jun-2007 08:39:38 UTC\r
+Last updated 08-Jun-2007 16:08:40 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:17 UTC\r
+Last updated 08-Jun-2007 16:08:39 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:18 UTC\r
+Last updated 08-Jun-2007 16:08:39 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:17 UTC\r
+Last updated 08-Jun-2007 16:08:39 UTC\r
</div>\r
</div>\r
</body>\r
GIT
---
Part of the gitlink:git[7] suite
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:22 UTC\r
+Last updated 08-Jun-2007 16:08:45 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 03-Jun-2007 08:39:38 UTC\r
+Last updated 08-Jun-2007 16:08:44 UTC\r
</div>\r
</div>\r
</body>\r
<ul>\r
<li>\r
<p>\r
-<a href="howto/dangling-objects.txt">dangling-objects</a> by Linus Torvalds <torvalds@linux-foundation.org>\r
-</p>\r
-</li>\r
-</ul>\r
-<p>Linus describes what dangling objects are, when they\r
-are left behind, and how to view their relationship with branch\r
-heads in gitk</p>\r
-<ul>\r
-<li>\r
-<p>\r
-<a href="howto/isolate-bugs-with-bisect.txt">isolate-bugs-with-bisect</a> by Linus Torvalds <torvalds () osdl ! org>\r
-</p>\r
-</li>\r
-</ul>\r
-<p>Short-n-sweet, Linus tells us how to leverage <tt>git-bisect</tt> to perform\r
-bug isolation on a repository where "good" and "bad" revisions are known\r
-in order to identify a suspect commit.</p>\r
-<ul>\r
-<li>\r
-<p>\r
-<a href="howto/make-dist.txt">make-dist</a> by Linus Torvalds <torvalds@osdl.org>\r
-</p>\r
-</li>\r
-</ul>\r
-<p>In this article, Linus talks about building a tarball,\r
-incremental patch, and ChangeLog, given a base release and two\r
-rc releases, following the convention of giving the patch from\r
-the base release and the latest rc, with ChangeLog between the\r
-last rc and the latest rc.</p>\r
-<ul>\r
-<li>\r
-<p>\r
<a href="howto/rebase-and-edit.txt">rebase-and-edit</a> by Linus Torvalds <torvalds@osdl.org>\r
</p>\r
</li>\r
<a href="howto/use-git-daemon.txt">use-git-daemon</a>\r
</p>\r
</li>\r
-<li>\r
-<p>\r
-<a href="howto/using-topic-branches.txt">using-topic-branches</a> by tony.luck@intel.com\r
-</p>\r
-</li>\r
</ul>\r
-<p>In this article, Tony Luck discusses how he uses GIT\r
-as a Linux subsystem maintainer.</p>\r
</div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:21 UTC\r
+Last updated 08-Jun-2007 16:08:44 UTC\r
</div>\r
</div>\r
</body>\r
Here is a collection of mailing list postings made by various
people describing how they use git in their workflow.
-* link:howto/dangling-objects.txt[dangling-objects] by Linus Torvalds <torvalds@linux-foundation.org>
-
-Linus describes what dangling objects are, when they
-are left behind, and how to view their relationship with branch
-heads in gitk
-
-
-* link:howto/isolate-bugs-with-bisect.txt[isolate-bugs-with-bisect] by Linus Torvalds <torvalds () osdl ! org>
-
-Short-n-sweet, Linus tells us how to leverage `git-bisect` to perform
-bug isolation on a repository where "good" and "bad" revisions are known
-in order to identify a suspect commit.
-
-
-* link:howto/make-dist.txt[make-dist] by Linus Torvalds <torvalds@osdl.org>
-
-In this article, Linus talks about building a tarball,
-incremental patch, and ChangeLog, given a base release and two
-rc releases, following the convention of giving the patch from
-the base release and the latest rc, with ChangeLog between the
-last rc and the latest rc.
-
-
* link:howto/rebase-and-edit.txt[rebase-and-edit] by Linus Torvalds <torvalds@osdl.org>
In this article, Linus demonstrates how a broken commit
-* link:howto/using-topic-branches.txt[using-topic-branches] by tony.luck@intel.com
-
-In this article, Tony Luck discusses how he uses GIT
-as a Linux subsystem maintainer.
-
-
On Sat, 13 Aug 2005, Linus Torvalds wrote:
-> That's correct. Same things apply: you can move a patch over, and create a
-> new one with a modified comment, but basically the _old_ commit will be
+> That's correct. Same things apply: you can move a patch over, and create a
+> new one with a modified comment, but basically the _old_ commit will be
> immutable.
Let me clarify.
You can entirely _drop_ old branches, so commits may be immutable, but
-nothing forces you to keep them. Of course, when you drop a commit, you'll
-always end up dropping all the commits that depended on it, and if you
-actually got somebody else to pull that commit you can't drop it from
+nothing forces you to keep them. Of course, when you drop a commit, you'll
+always end up dropping all the commits that depended on it, and if you
+actually got somebody else to pull that commit you can't drop it from
_their_ repository, but undoing things is not impossible.
For example, let's say that you've made a mess of things: you've committed
# for reference
git branch broken
- # Reset the main branch to three parents back: this
+ # Reset the main branch to three parents back: this
# effectively undoes the three top commits
git reset HEAD^^^
git checkout -f
to see that everything looks sensible.
-And then, you can just remove the broken branch if you decide you really
+And then, you can just remove the broken branch if you decide you really
don't want it:
# remove 'broken' branch
# Prune old objects if you're really really sure
git prune
-And yeah, I'm sure there are other ways of doing this. And as usual, the
-above is totally untested, and I just wrote it down in this email, so if
+And yeah, I'm sure there are other ways of doing this. And as usual, the
+above is totally untested, and I just wrote it down in this email, so if
I've done something wrong, you'll have to figure it out on your own ;)
Linus
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
-
-
> Dear diary, on Sun, Aug 14, 2005 at 09:57:13AM CEST, I got a letter
> where Junio C Hamano <junkio@cox.net> told me that...
>> Linus Torvalds <torvalds@osdl.org> writes:
->>
->> > Junio, maybe you want to talk about how you move patches from your "pu"
+>>
+>> > Junio, maybe you want to talk about how you move patches from your "pu"
>> > branch to the real branches.
->>
+>>
> Actually, wouldn't this be also precisely for what StGIT is intended to?
Exactly my feeling. I was sort of waiting for Catalin to speak
where *your "master" head
upstream --> #1 --> #2 --> #3
- used \
+ used \
to be \--> #A --> #2' --> #3' --> #B --> #C
*upstream head
$ git fetch upstream
This leaves the updated upstream head in .git/FETCH_HEAD but
-does not touch your .git/HEAD nor .git/refs/heads/master.
+does not touch your .git/HEAD nor .git/refs/heads/master.
You run "git rebase" now.
$ git rebase FETCH_HEAD master
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
-
-
- This is still crude and does not protect against simultaneous
make invocations stomping on each other. I would need to add
some locking mechanism for this.
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:23 UTC\r
+Last updated 08-Jun-2007 16:08:45 UTC\r
</div>\r
</div>\r
</body>\r
nor tag anymore, so remove them:
------------------------------------------------
-$ rm -f .git/refs/tags/pu-anchor
+$ rm -f .git/refs/tags/pu-anchor
$ git branch -d revert-c99
------------------------------------------------
"master"
o---o
- \ "topic"
+ \ "topic"
o---o---o---o---o---o
At this point, "topic" contains something I know I want, but it
$ git checkout -b topicA master
... pick and apply pieces from P.diff to build
... commits on topicA branch.
-
+
o---o---o
/ "topicA"
o---o"master"
- \ "topic"
+ \ "topic"
o---o---o---o---o---o
Before doing each commit on "topicA" HEAD, I run "diff HEAD"
/o---o---o
|/ "topicA"
o---o"master"
- \ "topic"
+ \ "topic"
o---o---o---o---o---o
After I am done, I'd try a pretend-merge between "topicA" and
/o---o---o----------'
|/ "topicA"
o---o"master"
- \ "topic"
+ \ "topic"
o---o---o---o---o---o
The last diff better not to show anything other than cleanups
"topicB"
o---o---o---o---o
- /
+ /
/o---o---o
|/ "topicA"
o---o"master"
-
$ git ls-remote git://127.0.0.1/rule-the-world.git
If this does not work, find out why, and submit a patch to this document.
-
If there is no `-s` option, a built-in list of strategies
is used instead (`git-merge-recursive` when merging a single
head, `git-merge-octopus` otherwise).
-
- '%Creset': reset color
- '%m': left, right or boundary mark
- '%n': newline
-
command to re-code the commit log message in the encoding
preferred by the user. For non plumbing commands this
defaults to UTF-8.
-
+
Some short-cut notations are also supported.
+
-* `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;
+* `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;
it requests fetching everything up to the given tag.
* A parameter <ref> without a colon is equivalent to
<ref>: when pulling/fetching, so it merges <ref> into the current
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:21 UTC\r
+Last updated 08-Jun-2007 16:08:44 UTC\r
</div>\r
</div>\r
</body>\r
This is similar to `info/grafts` but is internally used
and maintained by shallow clone mechanism. See `--depth`
option to gitlink:git-clone[1] and gitlink:git-fetch[1].
-
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:19 UTC\r
+Last updated 08-Jun-2007 16:08:41 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jun-2007 21:10:18 UTC\r
+Last updated 08-Jun-2007 16:08:40 UTC\r
</div>\r
</div>\r
</body>\r
Date: Sat Dec 2 22:22:25 2006 -0800
[XFRM]: Fix aevent structuring to be more complete.
-
+
aevents can not uniquely identify an SA. We break the ABI with this
patch, but consensus is that since it is not yet utilized by any
(known) application then it is fine (better do it now than later).
-
+
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/Documentation/networking/xfrm_sync.txt
+++ b/Documentation/networking/xfrm_sync.txt
@@ -47,10 +47,13 @@ aevent_id structure looks like:
-
+
struct xfrm_aevent_id {
struct xfrm_usersa_id sa_id;
+ xfrm_address_t saddr;
-------------------------------------------------
As a special shortcut,
-
+
-------------------------------------------------
$ git commit -a
-------------------------------------------------
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,
+old history using, for example,
-------------------------------------------------
$ git log master@{1}
reference pointing to it, for example, a new branch:
------------------------------------------------
-$ git branch recovered-branch 7281251ddd
+$ git branch recovered-branch 7281251ddd
------------------------------------------------
Other types of dangling objects (blobs and trees) are also possible, and
you push
your personal repo ------------------> your public repo
- ^ |
+ ^ |
| |
| you pull | they pull
| |
\ \
a--b--c--m <-- mywork
................................................
-
+
However, if you prefer to keep the history in mywork a simple series of
commits without any merges, you may instead choose to use
gitlink:git-rebase[1]:
root objects together into one project by creating a commit object which
has two or more separate roots as its ultimate parents, that's probably
just going to confuse people. So aim for the notion of "one root object
-per project", even if git itself does not enforce that.
+per project", even if git itself does not enforce that.
A <<def_tag_object,"tag" object>> symbolically identifies and can be
used to sign other objects. It contains the identifier and type of
be validated by verifying that (a) their hashes match the content of the
file and (b) the object successfully inflates to a stream of bytes that
forms a sequence of <ascii type without space> + <space> + <ascii decimal
-size> + <byte\0> + <binary object data>.
+size> + <byte\0> + <binary object data>.
The structured objects can further have their structure and
connectivity to other objects verified. This is generally done with
known tree object, or update/compare it with a live tree that is being
developed. If you blow the directory cache away entirely, you generally
haven't lost any information as long as you have the name of the tree
-that it described.
+that it described.
At the same time, the index is at the same time also the
staging area for creating new trees, and creating a new tree always
work *purely* on the index file (showing the current state of the
index), but most operations move data to and from the index file. Either
from the database or from the working directory. Thus there are four
-main combinations:
+main combinations:
[[working-directory-to-index]]
working directory -> index
leaving _some_ of the new objects in the object database, but just
dangling and useless.
-Anyway, once you are sure that you're not interested in any dangling
+Anyway, once you are sure that you're not interested in any dangling
state, you can just prune all unreachable objects:
------------------------------------------------
repository - it's kind of like doing a filesystem fsck recovery: you
don't want to do that while the filesystem is mounted.
-(The same is true of "git-fsck" itself, btw - but since
-git-fsck never actually *changes* the repository, it just reports
-on what it found, git-fsck itself is never "dangerous" to run.
-Running it while somebody is actually changing the repository can cause
-confusing and scary messages, but it won't actually do anything bad. In
-contrast, running "git prune" while somebody is actively changing the
+(The same is true of "git-fsck" itself, btw - but since
+git-fsck never actually *changes* the repository, it just reports
+on what it found, git-fsck itself is never "dangerous" to run.
+Running it while somebody is actually changing the repository can cause
+confusing and scary messages, but it won't actually do anything bad. In
+contrast, running "git prune" while somebody is actively changing the
repository is a *BAD* idea).
[[birdview-on-the-source-code]]
projects / git.git / commitdiff