diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-04-29 07:02:01 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-04-29 07:02:01 +0000 |
| commit | c8d88c2181b2e1675c5057ec9446be2f6f7529b3 (patch) | |
| tree | ff8704aff72f29d72cb8f8ddcf9b9066cbb54478 /everyday.html | |
| parent | 6de0ecdcce3d89e64a763ff208d44a8e65e5b332 (diff) | |
| download | git-htmldocs-c8d88c2181b2e1675c5057ec9446be2f6f7529b3.tar.gz | |
Autogenerated HTML docs for v1.3.1-g8971
Diffstat (limited to 'everyday.html')
| -rw-r--r-- | everyday.html | 421 |
1 files changed, 326 insertions, 95 deletions
diff --git a/everyday.html b/everyday.html index a51a09a61..5e768ab19 100644 --- a/everyday.html +++ b/everyday.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -330,16 +330,33 @@ Check health and remove cruft. $ git prune
$ git count-objects <b>(2)</b>
$ git repack <b>(3)</b>
-$ git prune <b>(4)</b>
-
-<b>(1)</b> running without "--full" is usually cheap and assures the
+$ git prune <b>(4)</b></tt></pre>
+</div></div>
+<ol>
+<li>
+<p>
+running without "—full" is usually cheap and assures the
repository health reasonably well.
-<b>(2)</b> check how many loose objects there are and how much
+</p>
+</li>
+<li>
+<p>
+check how many loose objects there are and how much
diskspace is wasted by not repacking.
-<b>(3)</b> without "-a" repacks incrementally. repacking every 4-5MB
+</p>
+</li>
+<li>
+<p>
+without "-a" repacks incrementally. repacking every 4-5MB
of loose objects accumulation may be a good rule of thumb.
-<b>(4)</b> after repack, prune removes the duplicate loose objects.</tt></pre>
-</div></div>
+</p>
+</li>
+<li>
+<p>
+after repack, prune removes the duplicate loose objects.
+</p>
+</li>
+</ol>
</dd>
<dt>
Repack a small project into single pack.
@@ -348,11 +365,16 @@ Repack a small project into single pack. <div class="listingblock">
<div class="content">
<pre><tt>$ git repack -a -d <b>(1)</b>
-$ git prune
-
-<b>(1)</b> pack all the objects reachable from the refs into one pack
-and remove unneeded other packs</tt></pre>
+$ git prune</tt></pre>
</div></div>
+<ol>
+<li>
+<p>
+pack all the objects reachable from the refs into one pack
+and remove unneeded other packs
+</p>
+</li>
+</ol>
</dd>
</dl>
</div>
@@ -437,11 +459,20 @@ $ cd frotz $ git-init-db
$ git add . <b>(1)</b>
$ git commit -m 'import of frotz source tree.'
-$ git tag v2.43 <b>(2)</b>
-
-<b>(1)</b> add everything under the current directory.
-<b>(2)</b> make a lightweight, unannotated tag.</tt></pre>
+$ git tag v2.43 <b>(2)</b></tt></pre>
</div></div>
+<ol>
+<li>
+<p>
+add everything under the current directory.
+</p>
+</li>
+<li>
+<p>
+make a lightweight, unannotated tag.
+</p>
+</li>
+</ol>
</dd>
<dt>
Create a topic branch and develop.
@@ -464,25 +495,74 @@ $ git commit -a -c ORIG_HEAD <b>(8)</b> $ git checkout master <b>(9)</b>
$ git pull . alsa-audio <b>(10)</b>
$ git log --since='3 days ago' <b>(11)</b>
-$ git log v2.43.. curses/ <b>(12)</b>
-
-<b>(1)</b> create a new topic branch.
-<b>(2)</b> revert your botched changes in "curses/ux_audio_oss.c".
-<b>(3)</b> you need to tell git if you added a new file; removal and
+$ git log v2.43.. curses/ <b>(12)</b></tt></pre>
+</div></div>
+<ol>
+<li>
+<p>
+create a new topic branch.
+</p>
+</li>
+<li>
+<p>
+revert your botched changes in "curses/ux_audio_oss.c".
+</p>
+</li>
+<li>
+<p>
+you need to tell git if you added a new file; removal and
modification will be caught if you do "commit -a" later.
-<b>(4)</b> to see what changes you are committing.
-<b>(5)</b> commit everything as you have tested, with your sign-off.
-<b>(6)</b> take the last commit back, keeping what is in the working tree.
-<b>(7)</b> look at the changes since the premature commit we took back.
-<b>(8)</b> redo the commit undone in the previous step, using the message
+</p>
+</li>
+<li>
+<p>
+to see what changes you are committing.
+</p>
+</li>
+<li>
+<p>
+commit everything as you have tested, with your sign-off.
+</p>
+</li>
+<li>
+<p>
+take the last commit back, keeping what is in the working tree.
+</p>
+</li>
+<li>
+<p>
+look at the changes since the premature commit we took back.
+</p>
+</li>
+<li>
+<p>
+redo the commit undone in the previous step, using the message
you originally wrote.
-<b>(9)</b> switch to the master branch.
-<b>(10)</b> merge a topic branch into your master branch
-<b>(11)</b> review commit logs; other forms to limit output can be
-combined and include --max-count=10 (show 10 commits), --until='2005-12-10'.
-<b>(12)</b> view only the changes that touch what's in curses/
-directory, since v2.43 tag.</tt></pre>
-</div></div>
+</p>
+</li>
+<li>
+<p>
+switch to the master branch.
+</p>
+</li>
+<li>
+<p>
+merge a topic branch into your master branch
+</p>
+</li>
+<li>
+<p>
+review commit logs; other forms to limit output can be
+combined and include —max-count=10 (show 10 commits), —until=<em>2005-12-10</em>.
+</p>
+</li>
+<li>
+<p>
+view only the changes that touch what's in curses/
+directory, since v2.43 tag.
+</p>
+</li>
+</ol>
</dd>
</dl>
</div>
@@ -534,21 +614,54 @@ $ git whatchanged -p ORIG_HEAD.. arch/i386 include/asm-i386 <b>(4)</b> $ git pull git://git.kernel.org/pub/.../jgarzik/libata-dev.git ALL <b>(5)</b>
$ git reset --hard ORIG_HEAD <b>(6)</b>
$ git prune <b>(7)</b>
-$ git fetch --tags <b>(8)</b>
-
-<b>(1)</b> repeat as needed.
-<b>(2)</b> extract patches from your branch for e-mail submission.
-<b>(3)</b> "pull" fetches from "origin" by default and merges into the
+$ git fetch --tags <b>(8)</b></tt></pre>
+</div></div>
+<ol>
+<li>
+<p>
+repeat as needed.
+</p>
+</li>
+<li>
+<p>
+extract patches from your branch for e-mail submission.
+</p>
+</li>
+<li>
+<p>
+"pull" fetches from "origin" by default and merges into the
current branch.
-<b>(4)</b> immediately after pulling, look at the changes done upstream
+</p>
+</li>
+<li>
+<p>
+immediately after pulling, look at the changes done upstream
since last time we checked, only in the
area we are interested in.
-<b>(5)</b> fetch from a specific branch from a specific repository and merge.
-<b>(6)</b> revert the pull.
-<b>(7)</b> garbage collect leftover objects from reverted pull.
-<b>(8)</b> from time to time, obtain official tags from the "origin"
-and store them under .git/refs/tags/.</tt></pre>
-</div></div>
+</p>
+</li>
+<li>
+<p>
+fetch from a specific branch from a specific repository and merge.
+</p>
+</li>
+<li>
+<p>
+revert the pull.
+</p>
+</li>
+<li>
+<p>
+garbage collect leftover objects from reverted pull.
+</p>
+</li>
+<li>
+<p>
+from time to time, obtain official tags from the "origin"
+and store them under .git/refs/tags/.
+</p>
+</li>
+</ol>
</dd>
<dt>
Push into another repository.
@@ -567,21 +680,42 @@ satellite$ git push origin <b>(4)</b> mothership$ cd frotz
mothership$ git checkout master
-mothership$ git pull . satellite <b>(5)</b>
-
-<b>(1)</b> mothership machine has a frotz repository under your home
+mothership$ git pull . satellite <b>(5)</b></tt></pre>
+</div></div>
+<ol>
+<li>
+<p>
+mothership machine has a frotz repository under your home
directory; clone from it to start a repository on the satellite
machine.
-<b>(2)</b> clone creates this file by default. It arranges "git pull"
+</p>
+</li>
+<li>
+<p>
+clone creates this file by default. It arranges "git pull"
to fetch and store the master branch head of mothership machine
to local "origin" branch.
-<b>(3)</b> arrange "git push" to push local "master" branch to
+</p>
+</li>
+<li>
+<p>
+arrange "git push" to push local "master" branch to
"satellite" branch of the mothership machine.
-<b>(4)</b> push will stash our work away on "satellite" branch on the
+</p>
+</li>
+<li>
+<p>
+push will stash our work away on "satellite" branch on the
mothership machine. You could use this as a back-up method.
-<b>(5)</b> on mothership machine, merge the work done on the satellite
-machine into the master branch.</tt></pre>
-</div></div>
+</p>
+</li>
+<li>
+<p>
+on mothership machine, merge the work done on the satellite
+machine into the master branch.
+</p>
+</li>
+</ol>
</dd>
<dt>
Branch off of a specific tag.
@@ -593,13 +727,22 @@ Branch off of a specific tag. $ edit/compile/test; git commit -a
$ git checkout master
$ git format-patch -k -m --stdout v2.6.14..private2.6.14 |
- git am -3 -k <b>(2)</b>
-
-<b>(1)</b> create a private branch based on a well known (but somewhat behind)
-tag.
-<b>(2)</b> forward port all changes in private2.6.14 branch to master branch
-without a formal "merging".</tt></pre>
+ git am -3 -k <b>(2)</b></tt></pre>
</div></div>
+<ol>
+<li>
+<p>
+create a private branch based on a well known (but somewhat behind)
+tag.
+</p>
+</li>
+<li>
+<p>
+forward port all changes in private2.6.14 branch to master branch
+without a formal "merging".
+</p>
+</li>
+</ol>
</dd>
</dl>
</div>
@@ -665,23 +808,66 @@ $ compile/test $ git tag -s -m 'GIT 0.99.9x' v0.99.9x <b>(10)</b>
$ git fetch ko && git show-branch master maint 'tags/ko-*' <b>(11)</b>
$ git push ko <b>(12)</b>
-$ git push ko v0.99.9x <b>(13)</b>
-
-<b>(1)</b> see what I was in the middle of doing, if any.
-<b>(2)</b> see what topic branches I have and think about how ready
+$ git push ko v0.99.9x <b>(13)</b></tt></pre>
+</div></div>
+<ol>
+<li>
+<p>
+see what I was in the middle of doing, if any.
+</p>
+</li>
+<li>
+<p>
+see what topic branches I have and think about how ready
they are.
-<b>(3)</b> read mails, save ones that are applicable, and save others
+</p>
+</li>
+<li>
+<p>
+read mails, save ones that are applicable, and save others
that are not quite ready.
-<b>(4)</b> apply them, interactively, with my sign-offs.
-<b>(5)</b> create topic branch as needed and apply, again with my
+</p>
+</li>
+<li>
+<p>
+apply them, interactively, with my sign-offs.
+</p>
+</li>
+<li>
+<p>
+create topic branch as needed and apply, again with my
sign-offs.
-<b>(6)</b> rebase internal topic branch that has not been merged to the
+</p>
+</li>
+<li>
+<p>
+rebase internal topic branch that has not been merged to the
master, nor exposed as a part of a stable branch.
-<b>(7)</b> restart "pu" every time from the master.
-<b>(8)</b> and bundle topic branches still cooking.
-<b>(9)</b> backport a critical fix.
-<b>(10)</b> create a signed tag.
-<b>(11)</b> make sure I did not accidentally rewind master beyond what I
+</p>
+</li>
+<li>
+<p>
+restart "pu" every time from the master.
+</p>
+</li>
+<li>
+<p>
+and bundle topic branches still cooking.
+</p>
+</li>
+<li>
+<p>
+backport a critical fix.
+</p>
+</li>
+<li>
+<p>
+create a signed tag.
+</p>
+</li>
+<li>
+<p>
+make sure I did not accidentally rewind master beyond what I
already pushed out. "ko" shorthand points at the repository I have
at kernel.org, and looks like this:
$ cat .git/remotes/ko
@@ -693,9 +879,19 @@ at kernel.org, and looks like this: Push: maint
In the output from "git show-branch", "master" should have
everything "ko-master" has.
-<b>(12)</b> push out the bleeding edge.
-<b>(13)</b> push the tag out, too.</tt></pre>
-</div></div>
+</p>
+</li>
+<li>
+<p>
+push out the bleeding edge.
+</p>
+</li>
+<li>
+<p>
+push the tag out, too.
+</p>
+</li>
+</ol>
</dd>
</dl>
</div>
@@ -745,14 +941,23 @@ bob:x:1001:1001::/home/bob:/usr/bin/git-shell cindy:x:1002:1002::/home/cindy:/usr/bin/git-shell
david:x:1003:1003::/home/david:/usr/bin/git-shell
$ grep git /etc/shells <b>(2)</b>
-/usr/bin/git-shell
-
-<b>(1)</b> log-in shell is set to /usr/bin/git-shell, which does not
+/usr/bin/git-shell</tt></pre>
+</div></div>
+<ol>
+<li>
+<p>
+log-in shell is set to /usr/bin/git-shell, which does not
allow anything but "git push" and "git pull". The users should
get an ssh access to the machine.
-<b>(2)</b> in many distributions /etc/shells needs to list what is used
-as the login shell.</tt></pre>
-</div></div>
+</p>
+</li>
+<li>
+<p>
+in many distributions /etc/shells needs to list what is used
+as the login shell.
+</p>
+</li>
+</ol>
</dd>
<dt>
CVS-style shared repository.
@@ -779,16 +984,33 @@ $ ls -l hooks/update <b>(3)</b> $ cat info/allowed-users <b>(4)</b>
refs/heads/master alice\|cindy
refs/heads/doc-update bob
-refs/tags/v[0-9]* david
-
-<b>(1)</b> place the developers into the same git group.
-<b>(2)</b> and make the shared repository writable by the group.
-<b>(3)</b> use update-hook example by Carl from Documentation/howto/
+refs/tags/v[0-9]* david</tt></pre>
+</div></div>
+<ol>
+<li>
+<p>
+place the developers into the same git group.
+</p>
+</li>
+<li>
+<p>
+and make the shared repository writable by the group.
+</p>
+</li>
+<li>
+<p>
+use update-hook example by Carl from Documentation/howto/
for branch policy control.
-<b>(4)</b> alice and cindy can push into master, only bob can push into doc-update.
+</p>
+</li>
+<li>
+<p>
+alice and cindy can push into master, only bob can push into doc-update.
david is the release manager and is the only person who can
-create and push version tags.</tt></pre>
-</div></div>
+create and push version tags.
+</p>
+</li>
+</ol>
</dd>
<dt>
HTTP server to support dumb protocol transfer.
@@ -798,17 +1020,26 @@ HTTP server to support dumb protocol transfer. <div class="content">
<pre><tt>dev$ git update-server-info <b>(1)</b>
dev$ ftp user@isp.example.com <b>(2)</b>
-ftp> cp -r .git /home/user/myproject.git
-
-<b>(1)</b> make sure your info/refs and objects/info/packs are up-to-date
-<b>(2)</b> upload to public HTTP server hosted by your ISP.</tt></pre>
+ftp> cp -r .git /home/user/myproject.git</tt></pre>
</div></div>
+<ol>
+<li>
+<p>
+make sure your info/refs and objects/info/packs are up-to-date
+</p>
+</li>
+<li>
+<p>
+upload to public HTTP server hosted by your ISP.
+</p>
+</li>
+</ol>
</dd>
</dl>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 27-Dec-2005 00:17:10 PDT
+Last updated 29-Apr-2006 07:01:35 UTC
</div>
</div>
</body>
|