Skip to content

Commit 7464064

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.5.0-rc0-g4aec
1 parent d793de5 commit 7464064

File tree

12 files changed

+603
-99
lines changed

12 files changed

+603
-99
lines changed

‎config.txt‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,25 @@ format.headers::
192192
Additional email headers to include in a patch to be submitted
193193
by mail. See gitlink:git-format-patch[1].
194194

195+
gc.reflogexpire::
196+
`git reflog expire` removes reflog entries older than
197+
this time; defaults to 90 days.
198+
199+
gc.reflogexpireunreachable::
200+
`git reflog expire` removes reflog entries older than
201+
this time and are not reachable from the current tip;
202+
defaults to 30 days.
203+
204+
gc.rerereresolved::
205+
Records of conflicted merge you resolved earlier are
206+
kept for this many days when `git rerere gc` is run.
207+
The default is 60 days. See gitlink:git-rerere[1].
208+
209+
gc.rerereunresolved::
210+
Records of conflicted merge you have not resolved are
211+
kept for this many days when `git rerere gc` is run.
212+
The default is 15 days. See gitlink:git-rerere[1].
213+
195214
gitcvs.enabled::
196215
Whether the cvs pserver interface is enabled for this repository.
197216
See gitlink:git-cvsserver[1].

‎everyday.html‎

Lines changed: 65 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ <h3>Examples</h3>
321321
<ol>
322322
<li>
323323
<p>
324-
running without "&#8212;full" is usually cheap and assures the
324+
running without <tt>--full</tt> is usually cheap and assures the
325325
repository health reasonably well.
326326
</p>
327327
</li>
@@ -333,7 +333,7 @@ <h3>Examples</h3>
333333
</li>
334334
<li>
335335
<p>
336-
without "-a" repacks incrementally. repacking every 4-5MB
336+
without <tt>-a</tt> repacks incrementally. repacking every 4-5MB
337337
of loose objects accumulation may be a good rule of thumb.
338338
</p>
339339
</li>
@@ -388,8 +388,7 @@ <h2>Individual Developer (Standalone)<a id="Individual Developer (Standalone)"><
388388
</li>
389389
<li>
390390
<p>
391-
<a href="git-add.html">git-add(1)</a> and <a href="git-update-index.html">git-update-index(1)</a> to manage
392-
the index file.
391+
<a href="git-add.html">git-add(1)</a> to manage the index file.
393392
</p>
394393
</li>
395394
<li>
@@ -411,8 +410,7 @@ <h2>Individual Developer (Standalone)<a id="Individual Developer (Standalone)"><
411410
</li>
412411
<li>
413412
<p>
414-
<a href="git-pull.html">git-pull(1)</a> with "." as the remote to merge between
415-
local branches.
413+
<a href="git-merge.html">git-merge(1)</a> to merge between local branches.
416414
</p>
417415
</li>
418416
<li>
@@ -427,8 +425,11 @@ <h2>Individual Developer (Standalone)<a id="Individual Developer (Standalone)"><
427425
</li>
428426
</ul>
429427
<h3>Examples</h3>
430-
<p>Use a tarball as a starting point for a new repository:</p>
431-
<p>+</p>
428+
<dl>
429+
<dt>
430+
Use a tarball as a starting point for a new repository.
431+
</dt>
432+
<dd>
432433
<div class="listingblock">
433434
<div class="content">
434435
<pre><tt>$ tar zxf frotz.tar.gz
@@ -438,10 +439,19 @@ <h3>Examples</h3>
438439
$ git commit -m 'import of frotz source tree.'
439440
$ git tag v2.43 <b>(2)</b></tt></pre>
440441
</div></div>
441-
<p>+
442-
&lt;1&gt; add everything under the current directory.
443-
&lt;2&gt; make a lightweight, unannotated tag.</p>
444-
<dl>
442+
<ol>
443+
<li>
444+
<p>
445+
add everything under the current directory.
446+
</p>
447+
</li>
448+
<li>
449+
<p>
450+
make a lightweight, unannotated tag.
451+
</p>
452+
</li>
453+
</ol>
454+
</dd>
445455
<dt>
446456
Create a topic branch and develop.
447457
</dt>
@@ -453,15 +463,15 @@ <h3>Examples</h3>
453463
$ git checkout -- curses/ux_audio_oss.c <b>(2)</b>
454464
$ git add curses/ux_audio_alsa.c <b>(3)</b>
455465
$ edit/compile/test
456-
$ git diff <b>(4)</b>
466+
$ git diff HEAD <b>(4)</b>
457467
$ git commit -a -s <b>(5)</b>
458468
$ edit/compile/test
459469
$ git reset --soft HEAD^ <b>(6)</b>
460470
$ edit/compile/test
461471
$ git diff ORIG_HEAD <b>(7)</b>
462472
$ git commit -a -c ORIG_HEAD <b>(8)</b>
463473
$ git checkout master <b>(9)</b>
464-
$ git pull . alsa-audio <b>(10)</b>
474+
$ git merge alsa-audio <b>(10)</b>
465475
$ git log --since='3 days ago' <b>(11)</b>
466476
$ git log v2.43.. curses/ <b>(12)</b></tt></pre>
467477
</div></div>
@@ -473,13 +483,13 @@ <h3>Examples</h3>
473483
</li>
474484
<li>
475485
<p>
476-
revert your botched changes in "curses/ux_audio_oss.c".
486+
revert your botched changes in <tt>curses/ux_audio_oss.c</tt>.
477487
</p>
478488
</li>
479489
<li>
480490
<p>
481491
you need to tell git if you added a new file; removal and
482-
modification will be caught if you do "commit -a" later.
492+
modification will be caught if you do <tt>git commit -a</tt> later.
483493
</p>
484494
</li>
485495
<li>
@@ -515,19 +525,21 @@ <h3>Examples</h3>
515525
</li>
516526
<li>
517527
<p>
518-
merge a topic branch into your master branch
528+
merge a topic branch into your master branch. You can also use
529+
<tt>git pull . alsa-audio</tt>, i.e. pull from the local repository.
519530
</p>
520531
</li>
521532
<li>
522533
<p>
523534
review commit logs; other forms to limit output can be
524-
combined and include &#8212;max-count=10 (show 10 commits), &#8212;until=<em>2005-12-10</em>.
535+
combined and include <tt>--max-count=10</tt> (show 10 commits),
536+
<tt>--until=2005-12-10</tt>, etc.
525537
</p>
526538
</li>
527539
<li>
528540
<p>
529-
view only the changes that touch what's in curses/
530-
directory, since v2.43 tag.
541+
view only the changes that touch what's in <tt>curses/</tt>
542+
directory, since <tt>v2.43</tt> tag.
531543
</p>
532544
</li>
533545
</ol>
@@ -597,7 +609,7 @@ <h3>Examples</h3>
597609
</li>
598610
<li>
599611
<p>
600-
"pull" fetches from "origin" by default and merges into the
612+
<tt>git pull</tt> fetches from <tt>origin</tt> by default and merges into the
601613
current branch.
602614
</p>
603615
</li>
@@ -625,8 +637,8 @@ <h3>Examples</h3>
625637
</li>
626638
<li>
627639
<p>
628-
from time to time, obtain official tags from the "origin"
629-
and store them under .git/refs/tags/.
640+
from time to time, obtain official tags from the <tt>origin</tt>
641+
and store them under <tt>.git/refs/tags/</tt>.
630642
</p>
631643
</li>
632644
</ol>
@@ -637,18 +649,21 @@ <h3>Examples</h3>
637649
<dd>
638650
<div class="listingblock">
639651
<div class="content">
640-
<pre><tt>satellite$ git clone mothership:frotz/.git frotz <b>(1)</b>
652+
<pre><tt>satellite$ git clone mothership:frotz frotz <b>(1)</b>
641653
satellite$ cd frotz
642-
satellite$ cat .git/remotes/origin <b>(2)</b>
643-
URL: mothership:frotz/.git
644-
Pull: master:origin
645-
satellite$ echo 'Push: master:satellite' &gt;&gt;.git/remotes/origin <b>(3)</b>
654+
satellite$ git repo-config --get-regexp '^(remote|branch)\.' <b>(2)</b>
655+
remote.origin.url mothership:frotz
656+
remote.origin.fetch refs/heads/*:refs/remotes/origin/*
657+
branch.master.remote origin
658+
branch.master.merge refs/heads/master
659+
satellite$ git repo-config remote.origin.push \
660+
master:refs/remotes/satellite/master <b>(3)</b>
646661
satellite$ edit/compile/test/commit
647662
satellite$ git push origin <b>(4)</b>
648663

649664
mothership$ cd frotz
650665
mothership$ git checkout master
651-
mothership$ git pull . satellite <b>(5)</b></tt></pre>
666+
mothership$ git merge satellite/master <b>(5)</b></tt></pre>
652667
</div></div>
653668
<ol>
654669
<li>
@@ -660,21 +675,22 @@ <h3>Examples</h3>
660675
</li>
661676
<li>
662677
<p>
663-
clone creates this file by default. It arranges "git pull"
664-
to fetch and store the master branch head of mothership machine
665-
to local "origin" branch.
678+
clone sets these configuration variables by default.
679+
It arranges <tt>git pull</tt> to fetch and store the branches of mothership
680+
machine to local <tt>remotes/origin/*</tt> tracking branches.
666681
</p>
667682
</li>
668683
<li>
669684
<p>
670-
arrange "git push" to push local "master" branch to
671-
"satellite" branch of the mothership machine.
685+
arrange <tt>git push</tt> to push local <tt>master</tt> branch to
686+
<tt>remotes/satellite/master</tt> branch of the mothership machine.
672687
</p>
673688
</li>
674689
<li>
675690
<p>
676-
push will stash our work away on "satellite" branch on the
677-
mothership machine. You could use this as a back-up method.
691+
push will stash our work away on <tt>remotes/satellite/master</tt>
692+
tracking branch on the mothership machine. You could use this as
693+
a back-up method.
678694
</p>
679695
</li>
680696
<li>
@@ -706,7 +722,7 @@ <h3>Examples</h3>
706722
</li>
707723
<li>
708724
<p>
709-
forward port all changes in private2.6.14 branch to master branch
725+
forward port all changes in <tt>private2.6.14</tt> branch to <tt>master</tt> branch
710726
without a formal "merging".
711727
</p>
712728
</li>
@@ -763,13 +779,13 @@ <h3>Examples</h3>
763779
&amp; s 2 3 4 5 ./+to-apply
764780
&amp; s 7 8 ./+hold-linus
765781
&amp; q
766-
$ git checkout master
782+
$ git checkout -b topic/one master
767783
$ git am -3 -i -s -u ./+to-apply <b>(4)</b>
768784
$ compile/test
769785
$ git checkout -b hold/linus &amp;&amp; git am -3 -i -s -u ./+hold-linus <b>(5)</b>
770786
$ git checkout topic/one &amp;&amp; git rebase master <b>(6)</b>
771-
$ git checkout pu &amp;&amp; git reset --hard master <b>(7)</b>
772-
$ git pull . topic/one topic/two &amp;&amp; git pull . hold/linus <b>(8)</b>
787+
$ git checkout pu &amp;&amp; git reset --hard next <b>(7)</b>
788+
$ git merge topic/one topic/two &amp;&amp; git merge hold/linus <b>(8)</b>
773789
$ git checkout maint
774790
$ git cherry-pick master~4 <b>(9)</b>
775791
$ compile/test
@@ -815,7 +831,7 @@ <h3>Examples</h3>
815831
</li>
816832
<li>
817833
<p>
818-
restart "pu" every time from the master.
834+
restart <tt>pu</tt> every time from the next.
819835
</p>
820836
</li>
821837
<li>
@@ -836,21 +852,24 @@ <h3>Examples</h3>
836852
<li>
837853
<p>
838854
make sure I did not accidentally rewind master beyond what I
839-
already pushed out. "ko" shorthand points at the repository I have
855+
already pushed out. <tt>ko</tt> shorthand points at the repository I have
840856
at kernel.org, and looks like this:
841857
</p>
842858
<div class="listingblock">
843859
<div class="content">
844860
<pre><tt>$ cat .git/remotes/ko
845861
URL: kernel.org:/pub/scm/git/git.git
846862
Pull: master:refs/tags/ko-master
863+
Pull: next:refs/tags/ko-next
847864
Pull: maint:refs/tags/ko-maint
848865
Push: master
866+
Push: next
849867
Push: +pu
850868
Push: maint</tt></pre>
851869
</div></div>
852-
<p>In the output from "git show-branch", "master" should have
853-
everything "ko-master" has.</p>
870+
<p>In the output from <tt>git show-branch</tt>, <tt>master</tt> should have
871+
everything <tt>ko-master</tt> has, and <tt>next</tt> should have
872+
everything <tt>ko-next</tt> has.</p>
854873
</li>
855874
<li>
856875
<p>
@@ -953,7 +972,7 @@ <h3>Examples</h3>
953972
<li>
954973
<p>
955974
log-in shell is set to /usr/bin/git-shell, which does not
956-
allow anything but "git push" and "git pull". The users should
975+
allow anything but <tt>git push</tt> and <tt>git pull</tt>. The users should
957976
get an ssh access to the machine.
958977
</p>
959978
</li>
@@ -1045,7 +1064,7 @@ <h3>Examples</h3>
10451064
</div>
10461065
<div id="footer">
10471066
<div id="footer-text">
1048-
Last updated 27-Oct-2006 09:29:03 UTC
1067+
Last updated 27-Dec-2006 10:59:46 UTC
10491068
</div>
10501069
</div>
10511070
</body>

0 commit comments

Comments
 (0)