summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Fredric <kentfredric@gmail.com>2010-09-29 12:42:56 +1300
committerKent Fredric <kentfredric@gmail.com>2010-09-29 12:42:56 +1300
commit8ee289a0acb7fd711686eac39a8ed8f9b99c3d46 (patch)
treed2172af3c19af4888819e4bcde9e2550a23298b5
parent[doc] More rebase article links (diff)
downloadperl-overlay-8ee289a0acb7fd711686eac39a8ed8f9b99c3d46.tar.gz
perl-overlay-8ee289a0acb7fd711686eac39a8ed8f9b99c3d46.tar.bz2
perl-overlay-8ee289a0acb7fd711686eac39a8ed8f9b99c3d46.zip
[doc] Upgrade to asciidoc so we can do syntax highlighting, insert a working-in-branch example
-rw-r--r--README/config226
-rw-r--r--README/git-tips.html225
-rw-r--r--README/git-tips.txt1
-rw-r--r--README/git-tips/contribution-order.html136
-rw-r--r--README/git-tips/linearize-commits.html136
-rw-r--r--README/git-tips/linearize-commits.txt1
-rw-r--r--README/git-tips/networks.html134
-rw-r--r--README/git-tips/repositories.html134
-rw-r--r--README/git-tips/work-in-a-branch.html673
-rw-r--r--README/git-tips/work-in-a-branch.txt59
10 files changed, 1393 insertions, 332 deletions
diff --git a/README/config b/README/config
index b84c9bff2..c5f474200 100644
--- a/README/config
+++ b/README/config
@@ -1,50 +1,41 @@
#
-# Generated by AsciiDoc 8.5.3 for xhtml11 article.
-# Wed Sep 29 09:45:20 2010
+# Generated by AsciiDoc 8.6.1 for xhtml11 article.
+# Wed Sep 29 12:35:11 2010
#
[attributes]
+outfilesuffix=.html
+numbered=
gt=>
+pagewidth=800
encoding=UTF-8
two-colons=::
basebackend-html=
textwidth=70
brvbar=|
backslash=\
+wj=&#8288;
+two-semicolons=;;
nbsp=&#160;
+amp=&
+badges=
+attributeentry-pattern=^:(?P<attrname>\w[^.]*?)(\.(?P<attrname2>.*?))?:(\s+(?P<attrvalue>.*))?$
zwsp=&#8203;
-note-caption=Note
basebackend=html
attributelist-pattern=(?u)(^\[\[(?P<id>[\w\-_]+)(,(?P<reftext>.*?))?\]\]$)|(^\[(?P<attrlist>.*)\]$)
-important-caption=Important
-figure-caption=Figure
+icons=
+pygments=
+sectids=
two_colons=::
+newline=\n
lt=<
-quirks=
+deg=&#176;
two_semicolons=;;
toclevels=4
+iconsdir=./images/icons
toc=
pageunits=
empty=
tabsize=8
-outfilesuffix=.html
-pagewidth=800
-attributeentry-pattern=^:(?P<attrname>\w[^.]*?)(\.(?P<attrname2>.*?))?:(\s+(?P<attrvalue>.*))?$
-newline=\r\n
-wj=&#8288;
-appendix-caption=Appendix
-two-semicolons=;;
-table-caption=Table
-amp=&
-badges=
-example-caption=Example
-tip-caption=Tip
-toc-title=Table of Contents
-numbered=
-caution-caption=Caution
-sectids=
-iconsdir=./images/icons
-warning-caption=Warning
-deg=&#176;
[titles]
sect4=^===== +(?P<title>[\S].*?)( +=====)?$
@@ -113,14 +104,14 @@ _=emphasis
[specialsections]
[tags]
-singlequoted={role?<span class="{role}">}{1,2,3?<span style="}{1?color:{1};}{2?background-color:{2};}{3?font-size:{3}em;}{1,2,3?">}{amp}#8216;|{amp}#8217;{1,2,3?</span>}{role?</span>}
-monospaced={role?<span class="{role}">}<tt{1,2,3? style="}{1?color:{1};}{2?background-color:{2};}{3?font-size:{3}em;}{1,2,3?"}>|</tt>{role?</span>}
-emphasis={role?<span class="{role}">}<em{1,2,3? style="}{1?color:{1};}{2?background-color:{2};}{3?font-size:{3}em;}{1,2,3?"}>|</em>{role?</span>}
-doublequoted={role?<span class="{role}">}{1,2,3?<span style="}{1?color:{1};}{2?background-color:{2};}{3?font-size:{3}em;}{1,2,3?">}{amp}#8220;|{amp}#8221;{1,2,3?</span>}{role?</span>}
-unquoted={role?<span class="{role}">}{1,2,3?<span style="{1?color:{1};}{2?background-color:{2};}{3?font-size:{3}em;}">}|{1,2,3?</span>}{role?</span>}
-subscript={role?<span class="{role}">}<sub{1,2,3? style="}{1?color:{1};}{2?background-color:{2};}{3?font-size:{3}em;}{1,2,3?"}>|</sub>{role?</span>}
-strong={role?<span class="{role}">}<strong{1,2,3? style="}{1?color:{1};}{2?background-color:{2};}{3?font-size:{3}em;}{1,2,3?"}>|</strong>{role?</span>}
-superscript={role?<span class="{role}">}<sup{1,2,3? style="}{1?color:{1};}{2?background-color:{2};}{3?font-size:{3}em;}{1,2,3?"}>|</sup>{role?</span>}
+singlequoted={amp}#8216;{1?<span class="{1}">}|{1?</span>}{amp}#8217;
+monospaced=<tt>{1?<span class="{1}">}|{1?</span>}</tt>
+emphasis=<em>{1?<span class="{1}">}|{1?</span>}</em>
+doublequoted={amp}#8220;{1?<span class="{1}">}|{1?</span>}{amp}#8221;
+unquoted={1?<span class="{1}">}|{1?</span>}
+subscript=<sub>{1?<span class="{1}">}|{1?</span>}</sub>
+strong=<strong>{1?<span class="{1}">}|{1?</span>}</strong>
+superscript=<sup>{1?<span class="{1}">}|{1?</span>}</sup>
[paradef-literal]
delimiter=(?s)(?P<text>\s+.*)
@@ -148,7 +139,9 @@ TIP-style=caption='{tip-caption}',name='tip',template='admonitionparagraph'
IMPORTANT-style=caption='{important-caption}',name='important',template='admonitionparagraph'
literal-style=template='literalparagraph',presubs=['verbatim']
verse-style=template='verseparagraph'
-source-style=filter='source-highlight -f xhtml -s {language} {src_numbered?--line-number} {src_tab?--tab={src_tab}}',posattrs=('style', 'language', 'src_numbered', 'src_tab'),postsubs=('callouts',),presubs=(),template='source-highlight-block'
+graphviz-style=filter='graphviz2png.py {verbose?-v} -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -L {layout=dot} -F {format=png} -',posattrs=('style', 'target', 'layout', 'format'),template='graphviz{format?-{format}}-block',presubs=()
+music-style=filter='music2png.py -m{verbose? -v}{format? -f {format}} -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -',posattrs=('style', 'target', 'format'),template='music-block',presubs=()
+source-style=filter='pygmentize -f html -l {language} {src_numbered?-O linenos=table}',posattrs=('style', 'language', 'src_numbered'),postsubs=('callouts',),presubs=(),template='source-highlight-block'
[listdef-bulleted]
delimiter=^\s*- +(?P<text>.+)$
@@ -335,44 +328,44 @@ tags=glossary
[listtags-numbered]
item=<li>|</li>
-list=<div class="olist{style? {style}}{compact-option? compact}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ol class="{style}">|</ol></div>
+list=<div class="olist{style? {style}}{compact-option? compact}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ol class="{style}">|</ol></div>
text=<p>|</p>
[listtags-qanda]
term=<p><em>|</em></p>
text=<p>|</p>
-list=<div class="qlist{style? {style}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ol>|</ol></div>
+list=<div class="qlist{style? {style}}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ol>|</ol></div>
label=
item=
entry=<li>|</li>
[listtags-bulleted]
item=<li>|</li>
-list=<div class="ulist{style? {style}}{compact-option? compact}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ul>|</ul></div>
+list=<div class="ulist{style? {style}}{compact-option? compact}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ul>|</ul></div>
text=<p>|</p>
[listtags-bibliography]
item=<li>|</li>
-list=<div class="ulist{style? {style}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ul>|</ul></div>
+list=<div class="ulist{style? {style}}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ul>|</ul></div>
text=<p>|</p>
[listtags-glossary]
term=<dt>|</dt>
text=<p>|</p>
-list=<div class="dlist{style? {style}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<dl>|</dl></div>
+list=<div class="dlist{style? {style}}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<dl>|</dl></div>
label=
item=<dd>|</dd>
entry=
[listtags-callout]
-item=<li>|</li>
-list=<div class="colist{style? {style}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ol>|</ol></div>
-text=<p>|</p>
+item=<tr><td><img src="{iconsdir}/callouts/{listindex}.png" alt="{listindex}" /></td><td>|</td></tr>
+list=<div class="colist{style? {style}}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<table>|</table></div>
+text=|
[listtags-labeled]
term=<dt class="hdlist1{strong-option? strong}">|</dt>
text=<p>|</p>
-list=<div class="dlist{compact-option? compact}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<dl>|</dl></div>
+list=<div class="dlist{compact-option? compact}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<dl>|</dl></div>
label=
item=<dd>|</dd>
entry=
@@ -380,7 +373,7 @@ entry=
[listtags-horizontal]
term=|<br />
text=<p style="margin-top: 0;">|</p>
-list=<div class="hdlist{compact-option? compact}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<table>{labelwidth?<col width="{labelwidth}%" />}{itemwidth?<col width="{itemwidth}%" />}|</table></div>
+list=<div class="hdlist{compact-option? compact}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<table>{labelwidth?<col width="{labelwidth}%" />}{itemwidth?<col width="{itemwidth}%" />}|</table></div>
label=<td class="hdlist1{strong-option? strong}">|</td>
item=<td class="hdlist2">|</td>
entry=<tr>|</tr>
@@ -416,9 +409,9 @@ template=listingblock
subs=verbatim
posattrs=style
code-style=filter='code-filter.py -b {basebackend} -l {language}',posattrs=('style', 'language'),postsubs=('callouts',),presubs=(),template='listingblock'
-graphviz-style=filter='graphviz2png.py {verbose?-v} -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -L {layout=dot} -',posattrs=('style', 'target', 'layout'),template='graphviz-block',presubs=()
-music-style=filter='music2png.py {verbose?-v} -m -f {format=abc} -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -',posattrs=('style', 'target', 'format'),template='music-block',presubs=()
-source-style=filter='source-highlight -f xhtml -s {language} {src_numbered?--line-number} {src_tab?--tab={src_tab}}',posattrs=('style', 'language', 'src_numbered', 'src_tab'),postsubs=('callouts',),presubs=(),template='source-highlight-block'
+graphviz-style=filter='graphviz2png.py {verbose?-v} -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -L {layout=dot} -F {format=png} -',posattrs=('style', 'target', 'layout', 'format'),template='graphviz{format?-{format}}-block',presubs=()
+music-style=filter='music2png.py -m{verbose? -v}{format? -f {format}} -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -',posattrs=('style', 'target', 'format'),template='music-block',presubs=()
+source-style=filter='pygmentize -f html -l {language} {src_numbered?-O linenos=table}',posattrs=('style', 'language', 'src_numbered'),postsubs=('callouts',),presubs=(),template='source-highlight-block'
[blockdef-literal]
delimiter=^\.{4,}$
@@ -457,14 +450,14 @@ posattrs=style
delimiter=^graphviz~{4,}$
template=graphviz-block
subs=none
-filter=graphviz2png.py {verbose?-v} -o "{outdir={indir}}/{target} -L {layout=dot}" -
+filter=graphviz2png.py {verbose?-v} -o "{outdir={indir}}/{target}" -L {layout=dot} -
posattrs=target,format
[blockdef-music]
delimiter=^music~{4,}$
template=music-block
subs=none
-filter=music2png.py {verbose?-v} -m -f {format=abc} -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -
+filter=music2png.py{verbose? -v} -f {format=abc} -o "{outdir={indir}}/{imagesdir=}{imagesdir?/}{target}" -
posattrs=target,format
[blockdef-source-highlight]
@@ -628,16 +621,16 @@ headdata=<th {colspan@1::colspan="{colspan}" }{rowspan@1::rowspan="{rowspan}" }a
(?su)[\\]?&lt;(?P<name>http|https|ftp|file|irc):(?P<target>//[^\s<>]*[\w/])&gt;=[]
(?su)(?<![">:\w._/-])[\\]?(?P<target>\w[\w._-]*@[\w._-]*\w)(?!["<\w_-])=mailto[]
(?su)[\\]?(?P<name>footnote|footnoteref):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=[]
-(?su)[\\]?\[\[\[(?P<attrlist>[\w][\w-]*?)\]\]\]=anchor3[]
-(?su)[\\]?\[\[(?P<attrlist>[\w"].*?)\]\]=anchor2[]
-(?su)[\\]?&lt;&lt;(?P<attrlist>[\w"].*?)&gt;&gt;=xref2[]
+(?su)[\\]?\[\[\[(?P<attrlist>[\w_:][\w_:.-]*?)\]\]\]=anchor3[]
+(?su)[\\]?\[\[(?P<attrlist>[\w"_:].*?)\]\]=anchor2[]
+(?su)[\\]?&lt;&lt;(?P<attrlist>[\w"_:].*?)&gt;&gt;=xref2[]
(?su)(?<!\()[\\]?\(\(\((?P<attrlist>[^(].*?)\)\)\)(?!\))=indexterm[]
(?<!\()[\\]?\(\((?P<attrlist>[^\s\(][^(].*?)\)\)(?!\))=indexterm2[]
[\\]?&lt;(?P<index>\d+)&gt;=callout[]
(?su)[\\]?(?P<name>pass):(?P<subslist>\S*?)\[(?P<passtext>.*?)(?<!\\)\]=[]
(?su)[\\]?\+\+\+(?P<passtext>.*?)\+\+\+=pass[]
(?su)[\\]?\$\$(?P<passtext>.*?)\$\$=pass[specialcharacters]
-(?su)(?<!\w)([\\]?`(?P<passtext>\S|\S.*?\S)`)(?!\w)=literal[specialcharacters]
+(?su)(?<!\w)([\\]?`(?P<passtext>\S|\S.*?\S)`)(?![`\w])=literal[specialcharacters]
(?mu)^[\\]?//(?P<passtext>[^/].*|)$=comment[normal]
(?u)^(?P<name>image|unfloat)::(?P<target>\S*?)(\[(?P<attrlist>.*?)\])$=#[]
(?u)^(?P<name>pass)::(?P<subslist>\S*?)(\[(?P<passtext>.*?)\])$=#[]
@@ -668,6 +661,12 @@ template::[pass-blockmacro]
[passblock]
|
+[filter-image-blockmacro]
+{target%}{counter2:target-number}
+{target%}{set2:target:{docname}__{target-number}.png}
+|
+template::[image-blockmacro]
+
[abstract]
template::[sect1]
@@ -681,10 +680,12 @@ template::[sect1]
template::[sect1]
[appendix]
+<div class="sect1{style? {style}}{role? {role}}">
<h2{id? id="{id}"}>{numbered?{sectnum} }{appendix-caption} {counter:appendix-number:A}: {title}</h2>
<div class="sectionbody">
|
</div>
+</div>
[glossary]
template::[sect1]
@@ -708,14 +709,14 @@ template::[sect1]
`{passtext}`
[asciimath-blockmacro]
-<div class="mathblock"{id? id="{id}"}>
+<div class="mathblock{role? {role}}"{id? id="{id}"}>
<div class="content">
<div class="title">{title}</div>
`{passtext}`
</div></div>
[asciimathblock]
-<div class="mathblock"{id? id="{id}"}>
+<div class="mathblock{role? {role}}"{id? id="{id}"}>
<div class="content">
<div class="title">{title}</div>
`|`
@@ -725,21 +726,21 @@ template::[sect1]
{passtext}
[latexmath-blockmacro]
-<div class="mathblock"{id? id="{id}"}>
+<div class="mathblock{role? {role}}"{id? id="{id}"}>
<div class="content">
<div class="title">{title}</div>
{passtext}
</div></div>
[latexmathblock]
-<div class="mathblock"{id? id="{id}"}>
+<div class="mathblock{role? {role}}"{id? id="{id}"}>
<div class="content">
<div class="title">{title}</div>
|
</div></div>
[image-inlinemacro]
-<span class="image">
+<span class="image{role? {role}}">
<a class="image" href="{link}">
{data-uri%}<img src="{imagesdir=}{imagesdir?/}{target}" alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"}{title? title="{title}"} />
{data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"}{title? title="{title}"} src="data:image/{eval:os.path.splitext('{target}')[1][1:]};base64,
@@ -748,7 +749,7 @@ template::[sect1]
</span>
[image-blockmacro]
-<div class="imageblock"{id? id="{id}"}{align? style="text-align:{align};"}{float? style="float:{float};"}>
+<div class="imageblock{style? {style}}{role? {role}}"{id? id="{id}"}{align? style="text-align:{align};"}{float? style="float:{float};"}>
<div class="content">
<a class="image" href="{link}">
{data-uri%}<img src="{imagesdir=}{imagesdir?/}{target}" alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"} />
@@ -756,7 +757,7 @@ template::[sect1]
{data-uri#}{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{imagesdir=}","{target}")}"}" />
{link#}</a>
</div>
-<div class="image-title">{caption={figure-caption} {counter:figure-number}: }{title}</div>
+<div class="title">{caption={figure-caption} {counter:figure-number}. }{title}</div>
</div>
[indexterm-inlinemacro]
@@ -773,7 +774,7 @@ template::[sect1]
{2#}<span class="footnote" id="_footnote_{1}"><br />[{2}]<br /></span>
[callout-inlinemacro]
-<b>&lt;{index}&gt;</b>
+<img src="{iconsdir}/callouts/{index}.png" alt="{index}" />
[literal-inlinemacro]
<tt>{passtext}</tt>
@@ -827,7 +828,7 @@ template::[sect1]
<strong>{words}</strong>
[paragraph]
-<div class="paragraph"{id? id="{id}"}>{title?<div class="title">{title}</div>}<p>
+<div class="paragraph{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<p>
|
</p></div>
@@ -841,7 +842,7 @@ template::[verseblock]
template::[admonitionblock]
[listingblock]
-<div class="listingblock"{id? id="{id}"}>
+<div class="listingblock{role? {role}}"{id? id="{id}"}>
<div class="title">{caption=}{title}</div>
<div class="content">
<pre><tt>
@@ -850,7 +851,7 @@ template::[admonitionblock]
</div></div>
[literalblock]
-<div class="literalblock"{id? id="{id}"}>
+<div class="literalblock{role? {role}}"{id? id="{id}"}>
<div class="title">{title}</div>
<div class="content">
<pre><tt>
@@ -859,9 +860,9 @@ template::[admonitionblock]
</div></div>
[sidebarblock]
-<div class="sidebarblock"{id? id="{id}"}>
-<div class="sidebar-content">
-<div class="sidebar-title">{title}</div>
+<div class="sidebarblock{role? {role}}"{id? id="{id}"}>
+<div class="content">
+<div class="title">{title}</div>
|
</div></div>
@@ -869,36 +870,36 @@ template::[admonitionblock]
template::[quoteblock]
[quoteblock]
-<div class="quoteblock"{id? id="{id}"}>
+<div class="quoteblock{role? {role}}"{id? id="{id}"}>
<div class="title">{title}</div>
-<div class="quoteblock-content">
+<div class="content">
|
</div>
-<div class="quoteblock-attribution">
-<em>{citetitle}</em><br />
+<div class="attribution">
+<em>{citetitle}</em>{attribution?<br />}
&#8212; {attribution}
</div></div>
[verseblock]
-<div class="verseblock"{id? id="{id}"}>
+<div class="verseblock{role? {role}}"{id? id="{id}"}>
<div class="title">{title}</div>
-<pre class="verseblock-content">
+<pre class="content">
|
</pre>
-<div class="verseblock-attribution">
-<em>{citetitle}</em><br />
+<div class="attribution">
+<em>{citetitle}</em>{attribution?<br />}
&#8212; {attribution}
</div></div>
[exampleblock]
-<div class="exampleblock"{id? id="{id}"}>
-<div class="title">{caption={example-caption} {counter:example-number}: }{title}</div>
-<div class="exampleblock-content">
+<div class="exampleblock{role? {role}}"{id? id="{id}"}>
+<div class="title">{caption={example-caption} {counter:example-number}. }{title}</div>
+<div class="content">
|
</div></div>
[admonitionblock]
-<div class="admonitionblock"{id? id="{id}"}>
+<div class="admonitionblock{role? {role}}"{id? id="{id}"}>
<table><tr>
<td class="icon">
{data-uri%}{icons#}<img src="{icon={iconsdir}/{name}.png}" alt="{caption}" />
@@ -914,7 +915,7 @@ template::[quoteblock]
</div>
[table]
-<div class="tableblock"{id? id="{id}"}>
+<div class="tableblock{role? {role}}"{id? id="{id}"}>
<table rules="{grid=all}"
style="margin-left:{align@left:0}{align@center|right:auto}; margin-right:{align@left|center:auto}{align@right:0};"
style="float:{float};"
@@ -961,7 +962,7 @@ cellspacing="0" cellpadding="4">
<h{level@1:2}{level@2:3}{level@3:4}{level@4:5}{id? id="{id}"} class="float">{title}</h{level@1:2}{level@2:3}{level@3:4}{level@4:5}>
[preamble]
-<div id="preamble"{id? id="{id}"}>
+<div id="preamble{role? {role}}"{id? id="{id}"}>
<div class="sectionbody">
|
</div>
@@ -972,22 +973,36 @@ cellspacing="0" cellpadding="4">
|
[sect1]
+<div class="sect1{style? {style}}{role? {role}}">
<h2{id? id="{id}"}>{numbered?{sectnum} }{title}</h2>
<div class="sectionbody">
|
</div>
+</div>
[sect2]
-<h3{id? id="{id}"}>{numbered?{sectnum} }{title}</h3><div style="clear:left"></div>
+<div class="sect2{style? {style}}{role? {role}}">
+<h3{id? id="{id}"}>{numbered?{sectnum} }{title}</h3>
|
+</div>
[sect3]
+<div class="sect3{style? {style}}{role? {role}}">
<h4{id? id="{id}"}>{numbered?{sectnum} }{title}</h4>
|
+</div>
[sect4]
+<div class="sect4{style? {style}}{role? {role}}">
<h5{id? id="{id}"}>{title}</h5>
|
+</div>
+
+[toc]
+<div id="toc">
+ <div id="toctitle">{toc-title}</div>
+ <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
+</div>
[header]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
@@ -1000,7 +1015,7 @@ cellspacing="0" cellpadding="4">
<style type="text/css">
/*<![CDATA[*/
include1::{stylesdir=./stylesheets}/{theme={backend}}.css[]
-include1::{stylesdir=./stylesheets}/{theme={backend}}-quirks.css[]
+include1::{stylesdir=./stylesheets}/pygments.css[]
/*]]>*/
</style>
<script type="text/javascript">
@@ -1009,8 +1024,9 @@ window.onload = function()\{asciidoc.footnotes();{toc? asciidoc.toc({toclevels})
include1::{scriptsdir=./javascripts}/asciidoc-xhtml11.js[]
/*]]>*/
</script>
+{docinfo#}{include:{docdir}/{docname}-docinfo.html}
</head>
-<body{max-width? style="max-width:{max-width}"}>
+<body class="{doctype}"{max-width? style="max-width:{max-width}"}>
<div id="header">
{notitle%}<h1>{doctitle}</h1>
{doctitle#}<span id="author">{author}</span><br />
@@ -1018,11 +1034,7 @@ include1::{scriptsdir=./javascripts}/asciidoc-xhtml11.js[]
{doctitle#}<span id="revnumber">version {revnumber}{revdate?,}</span>
{doctitle#}<span id="revdate">{revdate}</span>
{doctitle#}<br /><span id="revremark">{revremark}</span>
-{docinfo#}{include:{docdir}/{docname}-docinfo.html}
-<div id="toc">
- <div id="toctitle">{toc-title}</div>
- <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
-</div>
+{toc#}{template:toc}
</div>
<div id="content">
@@ -1031,22 +1043,44 @@ include1::{scriptsdir=./javascripts}/asciidoc-xhtml11.js[]
{disable-javascript%<div id="footnotes"><hr /></div>}
<div id="footer">
<div id="footer-text">
-Version {revnumber}<br />
-Last updated {docdate} {doctime}
+template::[footer-text]
</div>
<div id="footer-badges">
-Valid <a href="http://validator.w3.org/check?uri=referer">XHTML</a>
-and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a>.
+<a href="http://validator.w3.org/check?uri=referer">
+ <img style="border:0;width:88px;height:31px"
+ src="http://www.w3.org/Icons/valid-xhtml11-blue"
+ alt="Valid XHTML 1.1" height="31" width="88" />
+</a>
+<a href="http://jigsaw.w3.org/css-validator/">
+ <img style="border:0;width:88px;height:31px"
+ src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
+ alt="Valid CSS!" />
+</a>
+<a href="http://www.mozilla.org/products/firefox/">
+ <img style="border:none; width:110px; height:32px;"
+ src="http://www.spreadfirefox.com/community/images/affiliates/Buttons/110x32/safer.gif"
+ alt="Get Firefox!" />
+</a>
</div>
</div>
</body>
</html>
[graphviz-block]
-template::[image-blockmacro]
+template::[filter-image-blockmacro]
+
+[graphviz-svg-block]
+<div class="imageblock"{id? id="{id}"}{align? style="text-align:{align};"}{float? style="float:{float};"}>
+<div class="content">
+<a class="image" href="{link}">
+<object data="{imagesdir=}{imagesdir?/}{target}" type="image/svg+xml" />
+{link#}</a>
+</div>
+<div class="title">{caption={figure-caption} {counter:figure-number}. }{title}</div>
+</div>
[music-block]
-template::[image-blockmacro]
+template::[filter-image-blockmacro]
[source-highlight-block]
<div class="listingblock">
@@ -1056,5 +1090,3 @@ template::[image-blockmacro]
|
</div></div>
-[specialsections]
-
diff --git a/README/git-tips.html b/README/git-tips.html
index 09f94071a..9081770bd 100644
--- a/README/git-tips.html
+++ b/README/git-tips.html
@@ -2,8 +2,8 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<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 8.5.3"/>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8"/>
+<meta name="generator" content="AsciiDoc 8.6.1"/>
<title>Gentoo Perl Overlay Tips</title>
<style type="text/css">
/*<![CDATA[*/
@@ -261,6 +261,7 @@ div.tableblock > table {
thead, p.table.header {
font-family: sans-serif;
font-weight: bold;
+ color: #527bbd;
}
tfoot {
font-weight: bold;
@@ -340,6 +341,14 @@ span.footnote, span.footnoteref {
min-width: 100px;
}
+div.colist td {
+ padding-right: 0.5em;
+ padding-bottom: 0.3em;
+ vertical-align: top;
+}
+div.colist td img {
+ margin-top: 0.3em;
+}
@media print {
div#footer-badges { display: none; }
@@ -374,47 +383,73 @@ div.toclevel4 {
margin-left: 6em;
font-size: 0.9em;
}
-/* Workarounds for IE6's broken and incomplete CSS2. */
-
-div.sidebar-content {
- background: #ffffee;
- border: 1px solid silver;
- padding: 0.5em;
-}
-div.sidebar-title, div.image-title {
- color: #527bbd;
- font-family: sans-serif;
- font-weight: bold;
- margin-top: 0.0em;
- margin-bottom: 0.5em;
-}
-
-div.listingblock div.content {
- border: 1px solid silver;
- background: #f4f4f4;
- padding: 0.5em;
-}
-div.quoteblock-attribution {
- padding-top: 0.5em;
- text-align: right;
-}
-
-pre.verseblock-content {
- font-family: inherit;
-}
-div.verseblock-attribution {
- padding-top: 0.75em;
- text-align: left;
-}
-
-div.exampleblock-content {
- border-left: 3px solid #dddddd;
- padding-left: 0.5em;
-}
+/*
+ pygmentize filter
+*/
+.highlight .hll { background-color: #ffffcc }
+.highlight { background: #f4f4f4; }
+.highlight .c { color: #008800; font-style: italic } /* Comment */
+.highlight .err { border: 1px solid #FF0000 } /* Error */
+.highlight .k { color: #AA22FF; font-weight: bold } /* Keyword */
+.highlight .o { color: #666666 } /* Operator */
+.highlight .cm { color: #008800; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #008800 } /* Comment.Preproc */
+.highlight .c1 { color: #008800; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #008800; font-weight: bold } /* Comment.Special */
+.highlight .gd { color: #A00000 } /* Generic.Deleted */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #FF0000 } /* Generic.Error */
+.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.highlight .gi { color: #00A000 } /* Generic.Inserted */
+.highlight .go { color: #808080 } /* Generic.Output */
+.highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.highlight .gt { color: #0040D0 } /* Generic.Traceback */
+.highlight .kc { color: #AA22FF; font-weight: bold } /* Keyword.Constant */
+.highlight .kd { color: #AA22FF; font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { color: #AA22FF; font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { color: #AA22FF } /* Keyword.Pseudo */
+.highlight .kr { color: #AA22FF; font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #00BB00; font-weight: bold } /* Keyword.Type */
+.highlight .m { color: #666666 } /* Literal.Number */
+.highlight .s { color: #BB4444 } /* Literal.String */
+.highlight .na { color: #BB4444 } /* Name.Attribute */
+.highlight .nb { color: #AA22FF } /* Name.Builtin */
+.highlight .nc { color: #0000FF } /* Name.Class */
+.highlight .no { color: #880000 } /* Name.Constant */
+.highlight .nd { color: #AA22FF } /* Name.Decorator */
+.highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */
+.highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #00A000 } /* Name.Function */
+.highlight .nl { color: #A0A000 } /* Name.Label */
+.highlight .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+.highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */
+.highlight .nv { color: #B8860B } /* Name.Variable */
+.highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #666666 } /* Literal.Number.Float */
+.highlight .mh { color: #666666 } /* Literal.Number.Hex */
+.highlight .mi { color: #666666 } /* Literal.Number.Integer */
+.highlight .mo { color: #666666 } /* Literal.Number.Oct */
+.highlight .sb { color: #BB4444 } /* Literal.String.Backtick */
+.highlight .sc { color: #BB4444 } /* Literal.String.Char */
+.highlight .sd { color: #BB4444; font-style: italic } /* Literal.String.Doc */
+.highlight .s2 { color: #BB4444 } /* Literal.String.Double */
+.highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
+.highlight .sh { color: #BB4444 } /* Literal.String.Heredoc */
+.highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
+.highlight .sx { color: #008000 } /* Literal.String.Other */
+.highlight .sr { color: #BB6688 } /* Literal.String.Regex */
+.highlight .s1 { color: #BB4444 } /* Literal.String.Single */
+.highlight .ss { color: #B8860B } /* Literal.String.Symbol */
+.highlight .bp { color: #AA22FF } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #B8860B } /* Name.Variable.Class */
+.highlight .vg { color: #B8860B } /* Name.Variable.Global */
+.highlight .vi { color: #B8860B } /* Name.Variable.Instance */
+.highlight .il { color: #666666 } /* Literal.Number.Integer.Long */
-/* IE6 sets dynamically generated links as visited. */
-div#toc a:visited { color: blue; }
/*]]>*/
</style>
<script type="text/javascript">
@@ -551,7 +586,7 @@ footnotes: function () {
/*]]>*/
</script>
</head>
-<body>
+<body class="article">
<div id="header">
<h1>Gentoo Perl Overlay Tips</h1>
<span id="author">The #gentoo-perl team.</span><br/>
@@ -561,21 +596,30 @@ footnotes: function () {
</div>
</div>
<div id="content">
+<div class="sect1">
<h2 id="networks">1. Networks</h2>
<div class="sectionbody">
<div class="paragraph"><p>The Gentoo Perl Herd and the overlay contributors have various channels of
communications and interactions.</p></div>
-<h3 id="networks-irc">1.1. IRC</h3><div style="clear:left"/>
+<div class="sect2">
+<h3 id="networks-irc">1.1. IRC</h3>
<div class="paragraph"><p>The primary source for all direct Gentoo Perl communications is <tt>#gentoo-perl</tt>
on <tt>irc.freenode.org</tt></p></div>
-<h3 id="networks-sourcecontrol">1.2. Source-Control</h3><div style="clear:left"/>
+</div>
+<div class="sect2">
+<h3 id="networks-sourcecontrol">1.2. Source-Control</h3>
<div class="paragraph"><p>Overlays for Gentoo can be found on <a href="#repositories-github">Github</a> and
<a href="#repositories-gogo">the Gentoo Overlays website</a>.</p></div>
</div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_git">2. Git</h2>
<div class="sectionbody">
-<h3 id="repositories">2.1. Repositories</h3><div style="clear:left"/>
+<div class="sect2">
+<h3 id="repositories">2.1. Repositories</h3>
<div class="paragraph"><p>At the time of this writing, there are several repositories.</p></div>
+<div class="sect3">
<h4 id="repositories-gogo">2.1.1. Git.Overlays.Gentoo.org</h4>
<div class="paragraph"><p>Few people with commit rights.
Does not broadcast pushes to IRC.</p></div>
@@ -605,6 +649,8 @@ ReadWrite
</p>
</dd>
</dl></div>
+</div>
+<div class="sect3">
<h4 id="repositories-github">2.1.2. Github</h4>
<div class="paragraph"><p>Same number of commiters.
Supports people without direct access sending pull requests.
@@ -635,7 +681,10 @@ ReadWrite
</p>
</dd>
</dl></div>
-<h3 id="_recommended_contribution_order">2.2. Recommended Contribution Order</h3><div style="clear:left"/>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_recommended_contribution_order">2.2. Recommended Contribution Order</h3>
<div class="paragraph"><p>Contributions are recommended to be performed in the following order:</p></div>
<div class="olist arabic"><ol class="arabic">
<li>
@@ -664,7 +713,7 @@ which will make all our lives easier =).</p></div>
<div class="admonitionblock">
<table><tr>
<td class="icon">
-<div class="title">Tip</div>
+<img src="./images/icons/tip.png" alt="Tip"/>
</td>
<td class="content">It is strongly suggested to watch <a href="#networks-irc"><tt>#gentoo-perl</tt></a> for pushed commit notices so
you can anticipate a collison happening <em>before</em> it occurs outside the safety
@@ -674,7 +723,7 @@ of your pc</td>
<div class="admonitionblock">
<table><tr>
<td class="icon">
-<div class="title">Tip</div>
+<img src="./images/icons/tip.png" alt="Tip"/>
</td>
<td class="content">If <tt>git</tt> tells you there is an upstream non-fast forward merge, do make sure
you resolve it locally somehow, not just force it, unless you <em>know</em> what you
@@ -684,13 +733,15 @@ are doing.</td>
<div class="admonitionblock">
<table><tr>
<td class="icon">
-<div class="title">Tip</div>
+<img src="./images/icons/tip.png" alt="Tip"/>
</td>
<td class="content">For optimal continuity, it is suggested you do all you can possible to
linearize commits. See <a href="linearize_commits.txt">Linearizing Commits</a></td>
</tr></table>
</div>
-<h3 id="linearizecommits">2.3. Linearize Commmits</h3><div style="clear:left"/>
+</div>
+<div class="sect2">
+<h3 id="linearizecommits">2.3. Linearize Commmits</h3>
<div class="paragraph"><p>Messy commit histories with lots of needless merge branches just get confusing
when trying to work backwards and work out what happened.</p></div>
<div class="paragraph"><p>To resolve this issue, it is strongly recommended to utilize <tt>git rebase</tt> to
@@ -700,7 +751,8 @@ all the other commits they were going to be merged into.</p></div>
<div class="paragraph"><p>But the subject of <tt>git rebase</tt> is far too complex to summarise in this one
document, at least for now, so you should use other online sources to learn
this.</p></div>
-<h4 id="_git_rebase_related_articles">2.3.1. Git Rebase related Articles</h4>
+<div class="sect3">
+<h4 id="rebase">2.3.1. Git Rebase related Articles</h4>
<div class="dlist"><dl>
<dt class="hdlist1">
Tate Johnson
@@ -777,14 +829,79 @@ Kent Fredric
</dl></div>
</div>
</div>
+<div class="sect2">
+<h3 id="workinabranch">2.4. Work In A Branch</h3>
+<div class="paragraph"><p>Working in a branch instead of on <tt>master</tt> I have found to be a productive way
+to get things done with minimal interference from other commiters.</p></div>
+<div class="paragraph"><p>Working this way lets you track upstream changes locally, update your local
+master, and work on multiple subjects simultaneously without any conflicts,
+and without being forced to perform a merge/rebase as soon as changes occur
+upstream.</p></div>
+<div class="listingblock">
+<div class="content"><div class="highlight"><pre> git checkout master
+ <span class="c"># create a new branch to work in.</span>
+ git checkout -b updates
+ <span class="c"># hack on updates.</span>
+ <span class="c"># commit changes to update branch</span>
+ git commit -m <span class="s2">"Some message"</span>
+ <span class="c"># return to master</span>
+ git checkout master
+ <span class="c"># update master from upstream</span>
+ git pull -u -v
+
+ <span class="c"># create another branch from master for a quick-fix</span>
+ git checkout -b quickfix
+ <span class="c"># hack on quick fix</span>
+ <span class="c"># commit change to quick fix branch</span>
+ git commit -m <span class="s2">"Emergency Commit set"</span>
+ <span class="c"># return to master</span>
+ git checkout master
+ <span class="c"># check for changes from upstream.</span>
+ git pull -u -v
+ <span class="c"># Damn, updates happened.</span>
+ git checkout quickfix
+ <span class="c"># rebase quickfix on top of master</span>
+ git rebase -i master
+ git checkout master
+ <span class="c"># check again for upstream changes</span>
+ git pull -u -v
+ <span class="c"># Yay, no upstream changes, time to publish the changes in quickfix</span>
+ <span class="c"># --ff-only is good to prevent anarchy</span>
+ git merge --ff-only quickfix
+ git push upstream master
+ git branch -d quickfix
+
+ <span class="c"># return to work on updates</span>
+ git checkout updates
+ <span class="c"># move updates to be after master before continuing to hack</span>
+ git rebase -i master
+ <span class="c"># more hacking on updates</span>
+ git checkout master
+ <span class="c"># check for upstream changes</span>
+ git pull -u -v
+ <span class="c"># Yay, no upstream changes!</span>
+ git merge --ff-only updates
+ git push upstream master
+</pre></div></div></div>
+</div>
+</div>
+</div>
+</div>
<div id="footnotes"><hr/></div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-29 10:27:20 NZDT
+Last updated 2010-09-29 11:30:54 NZDT
</div>
<div id="footer-badges">
-Valid <a href="http://validator.w3.org/check?uri=referer">XHTML</a>
-and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a>.
+<a href="http://validator.w3.org/check?uri=referer">
+ <img style="border:0;width:88px;height:31px" src="http://www.w3.org/Icons/valid-xhtml11-blue" alt="Valid XHTML 1.1" height="31" width="88"/>
+</a>
+<a href="http://jigsaw.w3.org/css-validator/">
+ <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss-blue" alt="Valid CSS!"/>
+</a>
+<a href="http://www.mozilla.org/products/firefox/">
+ <img style="border:none; width:110px; height:32px;" src="http://www.spreadfirefox.com/community/images/affiliates/Buttons/110x32/safer.gif" alt="Get Firefox!"/>
+</a>
</div>
</div>
</body>
diff --git a/README/git-tips.txt b/README/git-tips.txt
index 9fb69f9f9..31cfa12e6 100644
--- a/README/git-tips.txt
+++ b/README/git-tips.txt
@@ -12,3 +12,4 @@ Git
include::git-tips/repositories.txt[]
include::git-tips/contribution-order.txt[]
include::git-tips/linearize-commits.txt[]
+include::git-tips/work-in-a-branch.txt[]
diff --git a/README/git-tips/contribution-order.html b/README/git-tips/contribution-order.html
index 5c27953e2..cc5ce9347 100644
--- a/README/git-tips/contribution-order.html
+++ b/README/git-tips/contribution-order.html
@@ -2,8 +2,8 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<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 8.5.3"/>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8"/>
+<meta name="generator" content="AsciiDoc 8.6.1"/>
<title>Recommended Contribution Order</title>
<style type="text/css">
/*<![CDATA[*/
@@ -261,6 +261,7 @@ div.tableblock > table {
thead, p.table.header {
font-family: sans-serif;
font-weight: bold;
+ color: #527bbd;
}
tfoot {
font-weight: bold;
@@ -340,6 +341,14 @@ span.footnote, span.footnoteref {
min-width: 100px;
}
+div.colist td {
+ padding-right: 0.5em;
+ padding-bottom: 0.3em;
+ vertical-align: top;
+}
+div.colist td img {
+ margin-top: 0.3em;
+}
@media print {
div#footer-badges { display: none; }
@@ -374,47 +383,73 @@ div.toclevel4 {
margin-left: 6em;
font-size: 0.9em;
}
-/* Workarounds for IE6's broken and incomplete CSS2. */
-
-div.sidebar-content {
- background: #ffffee;
- border: 1px solid silver;
- padding: 0.5em;
-}
-div.sidebar-title, div.image-title {
- color: #527bbd;
- font-family: sans-serif;
- font-weight: bold;
- margin-top: 0.0em;
- margin-bottom: 0.5em;
-}
-
-div.listingblock div.content {
- border: 1px solid silver;
- background: #f4f4f4;
- padding: 0.5em;
-}
-
-div.quoteblock-attribution {
- padding-top: 0.5em;
- text-align: right;
-}
-
-pre.verseblock-content {
- font-family: inherit;
-}
-div.verseblock-attribution {
- padding-top: 0.75em;
- text-align: left;
-}
-div.exampleblock-content {
- border-left: 3px solid #dddddd;
- padding-left: 0.5em;
-}
+/*
+ pygmentize filter
+*/
+.highlight .hll { background-color: #ffffcc }
+.highlight { background: #f4f4f4; }
+.highlight .c { color: #008800; font-style: italic } /* Comment */
+.highlight .err { border: 1px solid #FF0000 } /* Error */
+.highlight .k { color: #AA22FF; font-weight: bold } /* Keyword */
+.highlight .o { color: #666666 } /* Operator */
+.highlight .cm { color: #008800; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #008800 } /* Comment.Preproc */
+.highlight .c1 { color: #008800; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #008800; font-weight: bold } /* Comment.Special */
+.highlight .gd { color: #A00000 } /* Generic.Deleted */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #FF0000 } /* Generic.Error */
+.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.highlight .gi { color: #00A000 } /* Generic.Inserted */
+.highlight .go { color: #808080 } /* Generic.Output */
+.highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.highlight .gt { color: #0040D0 } /* Generic.Traceback */
+.highlight .kc { color: #AA22FF; font-weight: bold } /* Keyword.Constant */
+.highlight .kd { color: #AA22FF; font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { color: #AA22FF; font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { color: #AA22FF } /* Keyword.Pseudo */
+.highlight .kr { color: #AA22FF; font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #00BB00; font-weight: bold } /* Keyword.Type */
+.highlight .m { color: #666666 } /* Literal.Number */
+.highlight .s { color: #BB4444 } /* Literal.String */
+.highlight .na { color: #BB4444 } /* Name.Attribute */
+.highlight .nb { color: #AA22FF } /* Name.Builtin */
+.highlight .nc { color: #0000FF } /* Name.Class */
+.highlight .no { color: #880000 } /* Name.Constant */
+.highlight .nd { color: #AA22FF } /* Name.Decorator */
+.highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */
+.highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #00A000 } /* Name.Function */
+.highlight .nl { color: #A0A000 } /* Name.Label */
+.highlight .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+.highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */
+.highlight .nv { color: #B8860B } /* Name.Variable */
+.highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #666666 } /* Literal.Number.Float */
+.highlight .mh { color: #666666 } /* Literal.Number.Hex */
+.highlight .mi { color: #666666 } /* Literal.Number.Integer */
+.highlight .mo { color: #666666 } /* Literal.Number.Oct */
+.highlight .sb { color: #BB4444 } /* Literal.String.Backtick */
+.highlight .sc { color: #BB4444 } /* Literal.String.Char */
+.highlight .sd { color: #BB4444; font-style: italic } /* Literal.String.Doc */
+.highlight .s2 { color: #BB4444 } /* Literal.String.Double */
+.highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
+.highlight .sh { color: #BB4444 } /* Literal.String.Heredoc */
+.highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
+.highlight .sx { color: #008000 } /* Literal.String.Other */
+.highlight .sr { color: #BB6688 } /* Literal.String.Regex */
+.highlight .s1 { color: #BB4444 } /* Literal.String.Single */
+.highlight .ss { color: #B8860B } /* Literal.String.Symbol */
+.highlight .bp { color: #AA22FF } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #B8860B } /* Name.Variable.Class */
+.highlight .vg { color: #B8860B } /* Name.Variable.Global */
+.highlight .vi { color: #B8860B } /* Name.Variable.Instance */
+.highlight .il { color: #666666 } /* Literal.Number.Integer.Long */
-/* IE6 sets dynamically generated links as visited. */
-div#toc a:visited { color: blue; }
/*]]>*/
</style>
<script type="text/javascript">
@@ -551,7 +586,7 @@ footnotes: function () {
/*]]>*/
</script>
</head>
-<body>
+<body class="article">
<div id="header">
<h1>Recommended Contribution Order</h1>
<div id="toc">
@@ -590,7 +625,7 @@ which will make all our lives easier =).</p></div>
<div class="admonitionblock">
<table><tr>
<td class="icon">
-<div class="title">Tip</div>
+<img src="./images/icons/tip.png" alt="Tip"/>
</td>
<td class="content">It is strongly suggested to watch <a href="#networks-irc"><tt>#gentoo-perl</tt></a> for pushed commit notices so
you can anticipate a collison happening <em>before</em> it occurs outside the safety
@@ -600,7 +635,7 @@ of your pc</td>
<div class="admonitionblock">
<table><tr>
<td class="icon">
-<div class="title">Tip</div>
+<img src="./images/icons/tip.png" alt="Tip"/>
</td>
<td class="content">If <tt>git</tt> tells you there is an upstream non-fast forward merge, do make sure
you resolve it locally somehow, not just force it, unless you <em>know</em> what you
@@ -610,7 +645,7 @@ are doing.</td>
<div class="admonitionblock">
<table><tr>
<td class="icon">
-<div class="title">Tip</div>
+<img src="./images/icons/tip.png" alt="Tip"/>
</td>
<td class="content">For optimal continuity, it is suggested you do all you can possible to
linearize commits. See <a href="linearize_commits.txt">Linearizing Commits</a></td>
@@ -625,8 +660,15 @@ linearize commits. See <a href="linearize_commits.txt">Linearizing Commits</a></
Last updated 2010-09-29 09:22:59 NZDT
</div>
<div id="footer-badges">
-Valid <a href="http://validator.w3.org/check?uri=referer">XHTML</a>
-and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a>.
+<a href="http://validator.w3.org/check?uri=referer">
+ <img style="border:0;width:88px;height:31px" src="http://www.w3.org/Icons/valid-xhtml11-blue" alt="Valid XHTML 1.1" height="31" width="88"/>
+</a>
+<a href="http://jigsaw.w3.org/css-validator/">
+ <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss-blue" alt="Valid CSS!"/>
+</a>
+<a href="http://www.mozilla.org/products/firefox/">
+ <img style="border:none; width:110px; height:32px;" src="http://www.spreadfirefox.com/community/images/affiliates/Buttons/110x32/safer.gif" alt="Get Firefox!"/>
+</a>
</div>
</div>
</body>
diff --git a/README/git-tips/linearize-commits.html b/README/git-tips/linearize-commits.html
index d81a3b877..729d2d98b 100644
--- a/README/git-tips/linearize-commits.html
+++ b/README/git-tips/linearize-commits.html
@@ -2,8 +2,8 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<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 8.5.3"/>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8"/>
+<meta name="generator" content="AsciiDoc 8.6.1"/>
<title>Linearize Commmits</title>
<style type="text/css">
/*<![CDATA[*/
@@ -261,6 +261,7 @@ div.tableblock > table {
thead, p.table.header {
font-family: sans-serif;
font-weight: bold;
+ color: #527bbd;
}
tfoot {
font-weight: bold;
@@ -340,6 +341,14 @@ span.footnote, span.footnoteref {
min-width: 100px;
}
+div.colist td {
+ padding-right: 0.5em;
+ padding-bottom: 0.3em;
+ vertical-align: top;
+}
+div.colist td img {
+ margin-top: 0.3em;
+}
@media print {
div#footer-badges { display: none; }
@@ -374,47 +383,73 @@ div.toclevel4 {
margin-left: 6em;
font-size: 0.9em;
}
-/* Workarounds for IE6's broken and incomplete CSS2. */
-div.sidebar-content {
- background: #ffffee;
- border: 1px solid silver;
- padding: 0.5em;
-}
-div.sidebar-title, div.image-title {
- color: #527bbd;
- font-family: sans-serif;
- font-weight: bold;
- margin-top: 0.0em;
- margin-bottom: 0.5em;
-}
-
-div.listingblock div.content {
- border: 1px solid silver;
- background: #f4f4f4;
- padding: 0.5em;
-}
-
-div.quoteblock-attribution {
- padding-top: 0.5em;
- text-align: right;
-}
-
-pre.verseblock-content {
- font-family: inherit;
-}
-div.verseblock-attribution {
- padding-top: 0.75em;
- text-align: left;
-}
-
-div.exampleblock-content {
- border-left: 3px solid #dddddd;
- padding-left: 0.5em;
-}
+/*
+ pygmentize filter
+*/
+.highlight .hll { background-color: #ffffcc }
+.highlight { background: #f4f4f4; }
+.highlight .c { color: #008800; font-style: italic } /* Comment */
+.highlight .err { border: 1px solid #FF0000 } /* Error */
+.highlight .k { color: #AA22FF; font-weight: bold } /* Keyword */
+.highlight .o { color: #666666 } /* Operator */
+.highlight .cm { color: #008800; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #008800 } /* Comment.Preproc */
+.highlight .c1 { color: #008800; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #008800; font-weight: bold } /* Comment.Special */
+.highlight .gd { color: #A00000 } /* Generic.Deleted */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #FF0000 } /* Generic.Error */
+.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.highlight .gi { color: #00A000 } /* Generic.Inserted */
+.highlight .go { color: #808080 } /* Generic.Output */
+.highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.highlight .gt { color: #0040D0 } /* Generic.Traceback */
+.highlight .kc { color: #AA22FF; font-weight: bold } /* Keyword.Constant */
+.highlight .kd { color: #AA22FF; font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { color: #AA22FF; font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { color: #AA22FF } /* Keyword.Pseudo */
+.highlight .kr { color: #AA22FF; font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #00BB00; font-weight: bold } /* Keyword.Type */
+.highlight .m { color: #666666 } /* Literal.Number */
+.highlight .s { color: #BB4444 } /* Literal.String */
+.highlight .na { color: #BB4444 } /* Name.Attribute */
+.highlight .nb { color: #AA22FF } /* Name.Builtin */
+.highlight .nc { color: #0000FF } /* Name.Class */
+.highlight .no { color: #880000 } /* Name.Constant */
+.highlight .nd { color: #AA22FF } /* Name.Decorator */
+.highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */
+.highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #00A000 } /* Name.Function */
+.highlight .nl { color: #A0A000 } /* Name.Label */
+.highlight .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+.highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */
+.highlight .nv { color: #B8860B } /* Name.Variable */
+.highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #666666 } /* Literal.Number.Float */
+.highlight .mh { color: #666666 } /* Literal.Number.Hex */
+.highlight .mi { color: #666666 } /* Literal.Number.Integer */
+.highlight .mo { color: #666666 } /* Literal.Number.Oct */
+.highlight .sb { color: #BB4444 } /* Literal.String.Backtick */
+.highlight .sc { color: #BB4444 } /* Literal.String.Char */
+.highlight .sd { color: #BB4444; font-style: italic } /* Literal.String.Doc */
+.highlight .s2 { color: #BB4444 } /* Literal.String.Double */
+.highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
+.highlight .sh { color: #BB4444 } /* Literal.String.Heredoc */
+.highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
+.highlight .sx { color: #008000 } /* Literal.String.Other */
+.highlight .sr { color: #BB6688 } /* Literal.String.Regex */
+.highlight .s1 { color: #BB4444 } /* Literal.String.Single */
+.highlight .ss { color: #B8860B } /* Literal.String.Symbol */
+.highlight .bp { color: #AA22FF } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #B8860B } /* Name.Variable.Class */
+.highlight .vg { color: #B8860B } /* Name.Variable.Global */
+.highlight .vi { color: #B8860B } /* Name.Variable.Instance */
+.highlight .il { color: #666666 } /* Literal.Number.Integer.Long */
-/* IE6 sets dynamically generated links as visited. */
-div#toc a:visited { color: blue; }
/*]]>*/
</style>
<script type="text/javascript">
@@ -551,7 +586,7 @@ footnotes: function () {
/*]]>*/
</script>
</head>
-<body>
+<body class="article">
<div id="header">
<h1>Linearize Commmits</h1>
<div id="toc">
@@ -573,7 +608,8 @@ document, at least for now, so you should use other online sources to learn
this.</p></div>
</div>
</div>
-<h2 id="_git_rebase_related_articles">1. Git Rebase related Articles</h2>
+<div class="sect1">
+<h2 id="rebase">1. Git Rebase related Articles</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
@@ -651,14 +687,22 @@ Kent Fredric
</dl></div>
</div>
</div>
+</div>
<div id="footnotes"><hr/></div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-29 10:41:39 NZDT
+Last updated 2010-09-29 11:29:49 NZDT
</div>
<div id="footer-badges">
-Valid <a href="http://validator.w3.org/check?uri=referer">XHTML</a>
-and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a>.
+<a href="http://validator.w3.org/check?uri=referer">
+ <img style="border:0;width:88px;height:31px" src="http://www.w3.org/Icons/valid-xhtml11-blue" alt="Valid XHTML 1.1" height="31" width="88"/>
+</a>
+<a href="http://jigsaw.w3.org/css-validator/">
+ <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss-blue" alt="Valid CSS!"/>
+</a>
+<a href="http://www.mozilla.org/products/firefox/">
+ <img style="border:none; width:110px; height:32px;" src="http://www.spreadfirefox.com/community/images/affiliates/Buttons/110x32/safer.gif" alt="Get Firefox!"/>
+</a>
</div>
</div>
</body>
diff --git a/README/git-tips/linearize-commits.txt b/README/git-tips/linearize-commits.txt
index 772e7680d..191853aa5 100644
--- a/README/git-tips/linearize-commits.txt
+++ b/README/git-tips/linearize-commits.txt
@@ -14,6 +14,7 @@ But the subject of `git rebase` is far too complex to summarise in this one
document, at least for now, so you should use other online sources to learn
this.
+[[rebase]]
Git Rebase related Articles
---------------------------
diff --git a/README/git-tips/networks.html b/README/git-tips/networks.html
index a90339b96..3323a2ed5 100644
--- a/README/git-tips/networks.html
+++ b/README/git-tips/networks.html
@@ -2,8 +2,8 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<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 8.5.3"/>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8"/>
+<meta name="generator" content="AsciiDoc 8.6.1"/>
<title>Networks</title>
<style type="text/css">
/*<![CDATA[*/
@@ -261,6 +261,7 @@ div.tableblock > table {
thead, p.table.header {
font-family: sans-serif;
font-weight: bold;
+ color: #527bbd;
}
tfoot {
font-weight: bold;
@@ -340,6 +341,14 @@ span.footnote, span.footnoteref {
min-width: 100px;
}
+div.colist td {
+ padding-right: 0.5em;
+ padding-bottom: 0.3em;
+ vertical-align: top;
+}
+div.colist td img {
+ margin-top: 0.3em;
+}
@media print {
div#footer-badges { display: none; }
@@ -374,47 +383,73 @@ div.toclevel4 {
margin-left: 6em;
font-size: 0.9em;
}
-/* Workarounds for IE6's broken and incomplete CSS2. */
-
-div.sidebar-content {
- background: #ffffee;
- border: 1px solid silver;
- padding: 0.5em;
-}
-div.sidebar-title, div.image-title {
- color: #527bbd;
- font-family: sans-serif;
- font-weight: bold;
- margin-top: 0.0em;
- margin-bottom: 0.5em;
-}
-
-div.listingblock div.content {
- border: 1px solid silver;
- background: #f4f4f4;
- padding: 0.5em;
-}
-
-div.quoteblock-attribution {
- padding-top: 0.5em;
- text-align: right;
-}
-pre.verseblock-content {
- font-family: inherit;
-}
-div.verseblock-attribution {
- padding-top: 0.75em;
- text-align: left;
-}
-
-div.exampleblock-content {
- border-left: 3px solid #dddddd;
- padding-left: 0.5em;
-}
+/*
+ pygmentize filter
+*/
+.highlight .hll { background-color: #ffffcc }
+.highlight { background: #f4f4f4; }
+.highlight .c { color: #008800; font-style: italic } /* Comment */
+.highlight .err { border: 1px solid #FF0000 } /* Error */
+.highlight .k { color: #AA22FF; font-weight: bold } /* Keyword */
+.highlight .o { color: #666666 } /* Operator */
+.highlight .cm { color: #008800; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #008800 } /* Comment.Preproc */
+.highlight .c1 { color: #008800; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #008800; font-weight: bold } /* Comment.Special */
+.highlight .gd { color: #A00000 } /* Generic.Deleted */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #FF0000 } /* Generic.Error */
+.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.highlight .gi { color: #00A000 } /* Generic.Inserted */
+.highlight .go { color: #808080 } /* Generic.Output */
+.highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.highlight .gt { color: #0040D0 } /* Generic.Traceback */
+.highlight .kc { color: #AA22FF; font-weight: bold } /* Keyword.Constant */
+.highlight .kd { color: #AA22FF; font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { color: #AA22FF; font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { color: #AA22FF } /* Keyword.Pseudo */
+.highlight .kr { color: #AA22FF; font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #00BB00; font-weight: bold } /* Keyword.Type */
+.highlight .m { color: #666666 } /* Literal.Number */
+.highlight .s { color: #BB4444 } /* Literal.String */
+.highlight .na { color: #BB4444 } /* Name.Attribute */
+.highlight .nb { color: #AA22FF } /* Name.Builtin */
+.highlight .nc { color: #0000FF } /* Name.Class */
+.highlight .no { color: #880000 } /* Name.Constant */
+.highlight .nd { color: #AA22FF } /* Name.Decorator */
+.highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */
+.highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #00A000 } /* Name.Function */
+.highlight .nl { color: #A0A000 } /* Name.Label */
+.highlight .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+.highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */
+.highlight .nv { color: #B8860B } /* Name.Variable */
+.highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #666666 } /* Literal.Number.Float */
+.highlight .mh { color: #666666 } /* Literal.Number.Hex */
+.highlight .mi { color: #666666 } /* Literal.Number.Integer */
+.highlight .mo { color: #666666 } /* Literal.Number.Oct */
+.highlight .sb { color: #BB4444 } /* Literal.String.Backtick */
+.highlight .sc { color: #BB4444 } /* Literal.String.Char */
+.highlight .sd { color: #BB4444; font-style: italic } /* Literal.String.Doc */
+.highlight .s2 { color: #BB4444 } /* Literal.String.Double */
+.highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
+.highlight .sh { color: #BB4444 } /* Literal.String.Heredoc */
+.highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
+.highlight .sx { color: #008000 } /* Literal.String.Other */
+.highlight .sr { color: #BB6688 } /* Literal.String.Regex */
+.highlight .s1 { color: #BB4444 } /* Literal.String.Single */
+.highlight .ss { color: #B8860B } /* Literal.String.Symbol */
+.highlight .bp { color: #AA22FF } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #B8860B } /* Name.Variable.Class */
+.highlight .vg { color: #B8860B } /* Name.Variable.Global */
+.highlight .vi { color: #B8860B } /* Name.Variable.Instance */
+.highlight .il { color: #666666 } /* Literal.Number.Integer.Long */
-/* IE6 sets dynamically generated links as visited. */
-div#toc a:visited { color: blue; }
/*]]>*/
</style>
<script type="text/javascript">
@@ -551,7 +586,7 @@ footnotes: function () {
/*]]>*/
</script>
</head>
-<body>
+<body class="article">
<div id="header">
<h1>Networks</h1>
<div id="toc">
@@ -566,25 +601,36 @@ footnotes: function () {
communications and interactions.</p></div>
</div>
</div>
+<div class="sect1">
<h2 id="networks-irc">1. IRC</h2>
<div class="sectionbody">
<div class="paragraph"><p>The primary source for all direct Gentoo Perl communications is <tt>#gentoo-perl</tt>
on <tt>irc.freenode.org</tt></p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="networks-sourcecontrol">2. Source-Control</h2>
<div class="sectionbody">
<div class="paragraph"><p>Overlays for Gentoo can be found on <a href="#repositories-github">Github</a> and
<a href="#repositories-gogo">the Gentoo Overlays website</a>.</p></div>
</div>
</div>
+</div>
<div id="footnotes"><hr/></div>
<div id="footer">
<div id="footer-text">
Last updated 2010-09-29 09:22:59 NZDT
</div>
<div id="footer-badges">
-Valid <a href="http://validator.w3.org/check?uri=referer">XHTML</a>
-and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a>.
+<a href="http://validator.w3.org/check?uri=referer">
+ <img style="border:0;width:88px;height:31px" src="http://www.w3.org/Icons/valid-xhtml11-blue" alt="Valid XHTML 1.1" height="31" width="88"/>
+</a>
+<a href="http://jigsaw.w3.org/css-validator/">
+ <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss-blue" alt="Valid CSS!"/>
+</a>
+<a href="http://www.mozilla.org/products/firefox/">
+ <img style="border:none; width:110px; height:32px;" src="http://www.spreadfirefox.com/community/images/affiliates/Buttons/110x32/safer.gif" alt="Get Firefox!"/>
+</a>
</div>
</div>
</body>
diff --git a/README/git-tips/repositories.html b/README/git-tips/repositories.html
index acdae0cef..e1fb6f2c1 100644
--- a/README/git-tips/repositories.html
+++ b/README/git-tips/repositories.html
@@ -2,8 +2,8 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<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 8.5.3"/>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8"/>
+<meta name="generator" content="AsciiDoc 8.6.1"/>
<title>Repositories</title>
<style type="text/css">
/*<![CDATA[*/
@@ -261,6 +261,7 @@ div.tableblock > table {
thead, p.table.header {
font-family: sans-serif;
font-weight: bold;
+ color: #527bbd;
}
tfoot {
font-weight: bold;
@@ -340,6 +341,14 @@ span.footnote, span.footnoteref {
min-width: 100px;
}
+div.colist td {
+ padding-right: 0.5em;
+ padding-bottom: 0.3em;
+ vertical-align: top;
+}
+div.colist td img {
+ margin-top: 0.3em;
+}
@media print {
div#footer-badges { display: none; }
@@ -374,47 +383,73 @@ div.toclevel4 {
margin-left: 6em;
font-size: 0.9em;
}
-/* Workarounds for IE6's broken and incomplete CSS2. */
-
-div.sidebar-content {
- background: #ffffee;
- border: 1px solid silver;
- padding: 0.5em;
-}
-div.sidebar-title, div.image-title {
- color: #527bbd;
- font-family: sans-serif;
- font-weight: bold;
- margin-top: 0.0em;
- margin-bottom: 0.5em;
-}
-
-div.listingblock div.content {
- border: 1px solid silver;
- background: #f4f4f4;
- padding: 0.5em;
-}
-
-div.quoteblock-attribution {
- padding-top: 0.5em;
- text-align: right;
-}
-pre.verseblock-content {
- font-family: inherit;
-}
-div.verseblock-attribution {
- padding-top: 0.75em;
- text-align: left;
-}
-
-div.exampleblock-content {
- border-left: 3px solid #dddddd;
- padding-left: 0.5em;
-}
+/*
+ pygmentize filter
+*/
+.highlight .hll { background-color: #ffffcc }
+.highlight { background: #f4f4f4; }
+.highlight .c { color: #008800; font-style: italic } /* Comment */
+.highlight .err { border: 1px solid #FF0000 } /* Error */
+.highlight .k { color: #AA22FF; font-weight: bold } /* Keyword */
+.highlight .o { color: #666666 } /* Operator */
+.highlight .cm { color: #008800; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #008800 } /* Comment.Preproc */
+.highlight .c1 { color: #008800; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #008800; font-weight: bold } /* Comment.Special */
+.highlight .gd { color: #A00000 } /* Generic.Deleted */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #FF0000 } /* Generic.Error */
+.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.highlight .gi { color: #00A000 } /* Generic.Inserted */
+.highlight .go { color: #808080 } /* Generic.Output */
+.highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.highlight .gt { color: #0040D0 } /* Generic.Traceback */
+.highlight .kc { color: #AA22FF; font-weight: bold } /* Keyword.Constant */
+.highlight .kd { color: #AA22FF; font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { color: #AA22FF; font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { color: #AA22FF } /* Keyword.Pseudo */
+.highlight .kr { color: #AA22FF; font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #00BB00; font-weight: bold } /* Keyword.Type */
+.highlight .m { color: #666666 } /* Literal.Number */
+.highlight .s { color: #BB4444 } /* Literal.String */
+.highlight .na { color: #BB4444 } /* Name.Attribute */
+.highlight .nb { color: #AA22FF } /* Name.Builtin */
+.highlight .nc { color: #0000FF } /* Name.Class */
+.highlight .no { color: #880000 } /* Name.Constant */
+.highlight .nd { color: #AA22FF } /* Name.Decorator */
+.highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */
+.highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #00A000 } /* Name.Function */
+.highlight .nl { color: #A0A000 } /* Name.Label */
+.highlight .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+.highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */
+.highlight .nv { color: #B8860B } /* Name.Variable */
+.highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #666666 } /* Literal.Number.Float */
+.highlight .mh { color: #666666 } /* Literal.Number.Hex */
+.highlight .mi { color: #666666 } /* Literal.Number.Integer */
+.highlight .mo { color: #666666 } /* Literal.Number.Oct */
+.highlight .sb { color: #BB4444 } /* Literal.String.Backtick */
+.highlight .sc { color: #BB4444 } /* Literal.String.Char */
+.highlight .sd { color: #BB4444; font-style: italic } /* Literal.String.Doc */
+.highlight .s2 { color: #BB4444 } /* Literal.String.Double */
+.highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
+.highlight .sh { color: #BB4444 } /* Literal.String.Heredoc */
+.highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
+.highlight .sx { color: #008000 } /* Literal.String.Other */
+.highlight .sr { color: #BB6688 } /* Literal.String.Regex */
+.highlight .s1 { color: #BB4444 } /* Literal.String.Single */
+.highlight .ss { color: #B8860B } /* Literal.String.Symbol */
+.highlight .bp { color: #AA22FF } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #B8860B } /* Name.Variable.Class */
+.highlight .vg { color: #B8860B } /* Name.Variable.Global */
+.highlight .vi { color: #B8860B } /* Name.Variable.Instance */
+.highlight .il { color: #666666 } /* Literal.Number.Integer.Long */
-/* IE6 sets dynamically generated links as visited. */
-div#toc a:visited { color: blue; }
/*]]>*/
</style>
<script type="text/javascript">
@@ -551,7 +586,7 @@ footnotes: function () {
/*]]>*/
</script>
</head>
-<body>
+<body class="article">
<div id="header">
<h1>Repositories</h1>
<div id="toc">
@@ -565,6 +600,7 @@ footnotes: function () {
<div class="paragraph" id="repositories"><p>At the time of this writing, there are several repositories.</p></div>
</div>
</div>
+<div class="sect1">
<h2 id="repositories-gogo">1. Git.Overlays.Gentoo.org</h2>
<div class="sectionbody">
<div class="paragraph"><p>Few people with commit rights.
@@ -596,6 +632,8 @@ ReadWrite
</dd>
</dl></div>
</div>
+</div>
+<div class="sect1">
<h2 id="repositories-github">2. Github</h2>
<div class="sectionbody">
<div class="paragraph"><p>Same number of commiters.
@@ -629,14 +667,22 @@ ReadWrite
</dl></div>
</div>
</div>
+</div>
<div id="footnotes"><hr/></div>
<div id="footer">
<div id="footer-text">
Last updated 2010-09-29 09:22:59 NZDT
</div>
<div id="footer-badges">
-Valid <a href="http://validator.w3.org/check?uri=referer">XHTML</a>
-and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a>.
+<a href="http://validator.w3.org/check?uri=referer">
+ <img style="border:0;width:88px;height:31px" src="http://www.w3.org/Icons/valid-xhtml11-blue" alt="Valid XHTML 1.1" height="31" width="88"/>
+</a>
+<a href="http://jigsaw.w3.org/css-validator/">
+ <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss-blue" alt="Valid CSS!"/>
+</a>
+<a href="http://www.mozilla.org/products/firefox/">
+ <img style="border:none; width:110px; height:32px;" src="http://www.spreadfirefox.com/community/images/affiliates/Buttons/110x32/safer.gif" alt="Get Firefox!"/>
+</a>
</div>
</div>
</body>
diff --git a/README/git-tips/work-in-a-branch.html b/README/git-tips/work-in-a-branch.html
new file mode 100644
index 000000000..428779320
--- /dev/null
+++ b/README/git-tips/work-in-a-branch.html
@@ -0,0 +1,673 @@
+<?xml version="1.0"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8"/>
+<meta name="generator" content="AsciiDoc 8.6.1"/>
+<title>Work In A Branch</title>
+<style type="text/css">
+/*<![CDATA[*/
+/* Debug borders */
+p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
+/*
+ border: 1px solid red;
+*/
+}
+
+body {
+ margin: 1em 5% 1em 5%;
+}
+
+a {
+ color: blue;
+ text-decoration: underline;
+}
+a:visited {
+ color: fuchsia;
+}
+
+em {
+ font-style: italic;
+ color: navy;
+}
+
+strong {
+ font-weight: bold;
+ color: #083194;
+}
+
+tt {
+ color: navy;
+}
+
+h1, h2, h3, h4, h5, h6 {
+ color: #527bbd;
+ font-family: sans-serif;
+ margin-top: 1.2em;
+ margin-bottom: 0.5em;
+ line-height: 1.3;
+}
+
+h1, h2, h3 {
+ border-bottom: 2px solid silver;
+}
+h2 {
+ padding-top: 0.5em;
+}
+h3 {
+ float: left;
+}
+h3 + * {
+ clear: left;
+}
+
+div.sectionbody {
+ font-family: serif;
+ margin-left: 0;
+}
+
+hr {
+ border: 1px solid silver;
+}
+
+p {
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+}
+
+ul, ol, li > p {
+ margin-top: 0;
+}
+
+pre {
+ padding: 0;
+ margin: 0;
+}
+
+span#author {
+ color: #527bbd;
+ font-family: sans-serif;
+ font-weight: bold;
+ font-size: 1.1em;
+}
+span#email {
+}
+span#revnumber, span#revdate, span#revremark {
+ font-family: sans-serif;
+}
+
+div#footer {
+ font-family: sans-serif;
+ font-size: small;
+ border-top: 2px solid silver;
+ padding-top: 0.5em;
+ margin-top: 4.0em;
+}
+div#footer-text {
+ float: left;
+ padding-bottom: 0.5em;
+}
+div#footer-badges {
+ float: right;
+ padding-bottom: 0.5em;
+}
+
+div#preamble {
+ margin-top: 1.5em;
+ margin-bottom: 1.5em;
+}
+div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
+div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
+div.admonitionblock {
+ margin-top: 1.0em;
+ margin-bottom: 1.5em;
+}
+div.admonitionblock {
+ margin-top: 2.0em;
+ margin-bottom: 2.0em;
+ margin-right: 10%;
+ color: #606060;
+}
+
+div.content { /* Block element content. */
+ padding: 0;
+}
+
+/* Block element titles. */
+div.title, caption.title {
+ color: #527bbd;
+ font-family: sans-serif;
+ font-weight: bold;
+ text-align: left;
+ margin-top: 1.0em;
+ margin-bottom: 0.5em;
+}
+div.title + * {
+ margin-top: 0;
+}
+
+td div.title:first-child {
+ margin-top: 0.0em;
+}
+div.content div.title:first-child {
+ margin-top: 0.0em;
+}
+div.content + div.title {
+ margin-top: 0.0em;
+}
+
+div.sidebarblock > div.content {
+ background: #ffffee;
+ border: 1px solid silver;
+ padding: 0.5em;
+}
+
+div.listingblock > div.content {
+ border: 1px solid silver;
+ background: #f4f4f4;
+ padding: 0.5em;
+}
+
+div.quoteblock, div.verseblock {
+ padding-left: 1.0em;
+ margin-left: 1.0em;
+ margin-right: 10%;
+ border-left: 5px solid #dddddd;
+ color: #777777;
+}
+
+div.quoteblock > div.attribution {
+ padding-top: 0.5em;
+ text-align: right;
+}
+
+div.verseblock > pre.content {
+ font-family: inherit;
+}
+div.verseblock > div.attribution {
+ padding-top: 0.75em;
+ text-align: left;
+}
+/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
+div.verseblock + div.attribution {
+ text-align: left;
+}
+
+div.admonitionblock .icon {
+ vertical-align: top;
+ font-size: 1.1em;
+ font-weight: bold;
+ text-decoration: underline;
+ color: #527bbd;
+ padding-right: 0.5em;
+}
+div.admonitionblock td.content {
+ padding-left: 0.5em;
+ border-left: 3px solid #dddddd;
+}
+
+div.exampleblock > div.content {
+ border-left: 3px solid #dddddd;
+ padding-left: 0.5em;
+}
+
+div.imageblock div.content { padding-left: 0; }
+span.image img { border-style: none; }
+a.image:visited { color: white; }
+
+dl {
+ margin-top: 0.8em;
+ margin-bottom: 0.8em;
+}
+dt {
+ margin-top: 0.5em;
+ margin-bottom: 0;
+ font-style: normal;
+ color: navy;
+}
+dd > *:first-child {
+ margin-top: 0.1em;
+}
+
+ul, ol {
+ list-style-position: outside;
+}
+ol.arabic {
+ list-style-type: decimal;
+}
+ol.loweralpha {
+ list-style-type: lower-alpha;
+}
+ol.upperalpha {
+ list-style-type: upper-alpha;
+}
+ol.lowerroman {
+ list-style-type: lower-roman;
+}
+ol.upperroman {
+ list-style-type: upper-roman;
+}
+
+div.compact ul, div.compact ol,
+div.compact p, div.compact p,
+div.compact div, div.compact div {
+ margin-top: 0.1em;
+ margin-bottom: 0.1em;
+}
+
+div.tableblock > table {
+ border: 3px solid #527bbd;
+}
+thead, p.table.header {
+ font-family: sans-serif;
+ font-weight: bold;
+ color: #527bbd;
+}
+tfoot {
+ font-weight: bold;
+}
+td > div.verse {
+ white-space: pre;
+}
+p.table {
+ margin-top: 0;
+}
+/* Because the table frame attribute is overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
+ border-style: none;
+}
+div.tableblock > table[frame="hsides"] {
+ border-left-style: none;
+ border-right-style: none;
+}
+div.tableblock > table[frame="vsides"] {
+ border-top-style: none;
+ border-bottom-style: none;
+}
+
+
+div.hdlist {
+ margin-top: 0.8em;
+ margin-bottom: 0.8em;
+}
+div.hdlist tr {
+ padding-bottom: 15px;
+}
+dt.hdlist1.strong, td.hdlist1.strong {
+ font-weight: bold;
+}
+td.hdlist1 {
+ vertical-align: top;
+ font-style: normal;
+ padding-right: 0.8em;
+ color: navy;
+}
+td.hdlist2 {
+ vertical-align: top;
+}
+div.hdlist.compact tr {
+ margin: 0;
+ padding-bottom: 0;
+}
+
+.comment {
+ background: yellow;
+}
+
+.footnote, .footnoteref {
+ font-size: 0.8em;
+}
+
+span.footnote, span.footnoteref {
+ vertical-align: super;
+}
+
+#footnotes {
+ margin: 20px 0 20px 0;
+ padding: 7px 0 0 0;
+}
+
+#footnotes div.footnote {
+ margin: 0 0 5px 0;
+}
+
+#footnotes hr {
+ border: none;
+ border-top: 1px solid silver;
+ height: 1px;
+ text-align: left;
+ margin-left: 0;
+ width: 20%;
+ min-width: 100px;
+}
+
+div.colist td {
+ padding-right: 0.5em;
+ padding-bottom: 0.3em;
+ vertical-align: top;
+}
+div.colist td img {
+ margin-top: 0.3em;
+}
+
+@media print {
+ div#footer-badges { display: none; }
+}
+
+div#toc {
+ margin-bottom: 2.5em;
+}
+
+div#toctitle {
+ color: #527bbd;
+ font-family: sans-serif;
+ font-size: 1.1em;
+ font-weight: bold;
+ margin-top: 1.0em;
+ margin-bottom: 0.1em;
+}
+
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+div.toclevel2 {
+ margin-left: 2em;
+ font-size: 0.9em;
+}
+div.toclevel3 {
+ margin-left: 4em;
+ font-size: 0.9em;
+}
+div.toclevel4 {
+ margin-left: 6em;
+ font-size: 0.9em;
+}
+
+/*
+ pygmentize filter
+*/
+.highlight .hll { background-color: #ffffcc }
+.highlight { background: #f4f4f4; }
+.highlight .c { color: #008800; font-style: italic } /* Comment */
+.highlight .err { border: 1px solid #FF0000 } /* Error */
+.highlight .k { color: #AA22FF; font-weight: bold } /* Keyword */
+.highlight .o { color: #666666 } /* Operator */
+.highlight .cm { color: #008800; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #008800 } /* Comment.Preproc */
+.highlight .c1 { color: #008800; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #008800; font-weight: bold } /* Comment.Special */
+.highlight .gd { color: #A00000 } /* Generic.Deleted */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #FF0000 } /* Generic.Error */
+.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.highlight .gi { color: #00A000 } /* Generic.Inserted */
+.highlight .go { color: #808080 } /* Generic.Output */
+.highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.highlight .gt { color: #0040D0 } /* Generic.Traceback */
+.highlight .kc { color: #AA22FF; font-weight: bold } /* Keyword.Constant */
+.highlight .kd { color: #AA22FF; font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { color: #AA22FF; font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { color: #AA22FF } /* Keyword.Pseudo */
+.highlight .kr { color: #AA22FF; font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #00BB00; font-weight: bold } /* Keyword.Type */
+.highlight .m { color: #666666 } /* Literal.Number */
+.highlight .s { color: #BB4444 } /* Literal.String */
+.highlight .na { color: #BB4444 } /* Name.Attribute */
+.highlight .nb { color: #AA22FF } /* Name.Builtin */
+.highlight .nc { color: #0000FF } /* Name.Class */
+.highlight .no { color: #880000 } /* Name.Constant */
+.highlight .nd { color: #AA22FF } /* Name.Decorator */
+.highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */
+.highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #00A000 } /* Name.Function */
+.highlight .nl { color: #A0A000 } /* Name.Label */
+.highlight .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+.highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */
+.highlight .nv { color: #B8860B } /* Name.Variable */
+.highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #666666 } /* Literal.Number.Float */
+.highlight .mh { color: #666666 } /* Literal.Number.Hex */
+.highlight .mi { color: #666666 } /* Literal.Number.Integer */
+.highlight .mo { color: #666666 } /* Literal.Number.Oct */
+.highlight .sb { color: #BB4444 } /* Literal.String.Backtick */
+.highlight .sc { color: #BB4444 } /* Literal.String.Char */
+.highlight .sd { color: #BB4444; font-style: italic } /* Literal.String.Doc */
+.highlight .s2 { color: #BB4444 } /* Literal.String.Double */
+.highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
+.highlight .sh { color: #BB4444 } /* Literal.String.Heredoc */
+.highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
+.highlight .sx { color: #008000 } /* Literal.String.Other */
+.highlight .sr { color: #BB6688 } /* Literal.String.Regex */
+.highlight .s1 { color: #BB4444 } /* Literal.String.Single */
+.highlight .ss { color: #B8860B } /* Literal.String.Symbol */
+.highlight .bp { color: #AA22FF } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #B8860B } /* Name.Variable.Class */
+.highlight .vg { color: #B8860B } /* Name.Variable.Global */
+.highlight .vi { color: #B8860B } /* Name.Variable.Instance */
+.highlight .il { color: #666666 } /* Literal.Number.Integer.Long */
+
+/*]]>*/
+</style>
+<script type="text/javascript">
+/*<![CDATA[*/
+window.onload = function(){asciidoc.footnotes(); asciidoc.toc(4);}
+var asciidoc = { // Namespace.
+
+/////////////////////////////////////////////////////////////////////
+// Table Of Contents generator
+/////////////////////////////////////////////////////////////////////
+
+/* Author: Mihai Bazon, September 2002
+ * http://students.infoiasi.ro/~mishoo
+ *
+ * Table Of Content generator
+ * Version: 0.4
+ *
+ * Feel free to use this script under the terms of the GNU General Public
+ * License, as long as you do not remove or alter this notice.
+ */
+
+ /* modified by Troy D. Hanson, September 2006. License: GPL */
+ /* modified by Stuart Rackham, 2006, 2009. License: GPL */
+
+// toclevels = 1..4.
+toc: function (toclevels) {
+
+ function getText(el) {
+ var text = "";
+ for (var i = el.firstChild; i != null; i = i.nextSibling) {
+ if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
+ text += i.data;
+ else if (i.firstChild != null)
+ text += getText(i);
+ }
+ return text;
+ }
+
+ function TocEntry(el, text, toclevel) {
+ this.element = el;
+ this.text = text;
+ this.toclevel = toclevel;
+ }
+
+ function tocEntries(el, toclevels) {
+ var result = new Array;
+ var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
+ // Function that scans the DOM tree for header elements (the DOM2
+ // nodeIterator API would be a better technique but not supported by all
+ // browsers).
+ var iterate = function (el) {
+ for (var i = el.firstChild; i != null; i = i.nextSibling) {
+ if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
+ var mo = re.exec(i.tagName);
+ if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
+ result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
+ }
+ iterate(i);
+ }
+ }
+ }
+ iterate(el);
+ return result;
+ }
+
+ var toc = document.getElementById("toc");
+ var entries = tocEntries(document.getElementById("content"), toclevels);
+ for (var i = 0; i < entries.length; ++i) {
+ var entry = entries[i];
+ if (entry.element.id == "")
+ entry.element.id = "_toc_" + i;
+ var a = document.createElement("a");
+ a.href = "#" + entry.element.id;
+ a.appendChild(document.createTextNode(entry.text));
+ var div = document.createElement("div");
+ div.appendChild(a);
+ div.className = "toclevel" + entry.toclevel;
+ toc.appendChild(div);
+ }
+ if (entries.length == 0)
+ toc.parentNode.removeChild(toc);
+},
+
+
+/////////////////////////////////////////////////////////////////////
+// Footnotes generator
+/////////////////////////////////////////////////////////////////////
+
+/* Based on footnote generation code from:
+ * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
+ */
+
+footnotes: function () {
+ var cont = document.getElementById("content");
+ var noteholder = document.getElementById("footnotes");
+ var spans = cont.getElementsByTagName("span");
+ var refs = {};
+ var n = 0;
+ for (i=0; i<spans.length; i++) {
+ if (spans[i].className == "footnote") {
+ n++;
+ // Use [\s\S] in place of . so multi-line matches work.
+ // Because JavaScript has no s (dotall) regex flag.
+ note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
+ noteholder.innerHTML +=
+ "<div class='footnote' id='_footnote_" + n + "'>" +
+ "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
+ n + "</a>. " + note + "</div>";
+ spans[i].innerHTML =
+ "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
+ "' title='View footnote' class='footnote'>" + n + "</a>]";
+ var id =spans[i].getAttribute("id");
+ if (id != null) refs["#"+id] = n;
+ }
+ }
+ if (n == 0)
+ noteholder.parentNode.removeChild(noteholder);
+ else {
+ // Process footnoterefs.
+ for (i=0; i<spans.length; i++) {
+ if (spans[i].className == "footnoteref") {
+ var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
+ href = href.match(/#.*/)[0]; // Because IE return full URL.
+ n = refs[href];
+ spans[i].innerHTML =
+ "[<a href='#_footnote_" + n +
+ "' title='View footnote' class='footnote'>" + n + "</a>]";
+ }
+ }
+ }
+}
+
+}
+/*]]>*/
+</script>
+</head>
+<body class="article">
+<div id="header">
+<h1>Work In A Branch</h1>
+<div id="toc">
+ <div id="toctitle">Table of Contents</div>
+ <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
+</div>
+</div>
+<div id="content">
+<div id="preamble">
+<div class="sectionbody">
+<div class="paragraph" id="workinabranch"><p>Working in a branch instead of on <tt>master</tt> I have found to be a productive way
+to get things done with minimal interference from other commiters.</p></div>
+<div class="paragraph"><p>Working this way lets you track upstream changes locally, update your local
+master, and work on multiple subjects simultaneously without any conflicts,
+and without being forced to perform a merge/rebase as soon as changes occur
+upstream.</p></div>
+<div class="listingblock">
+<div class="content"><div class="highlight"><pre> git checkout master
+ <span class="c"># create a new branch to work in.</span>
+ git checkout -b updates
+ <span class="c"># hack on updates.</span>
+ <span class="c"># commit changes to update branch</span>
+ git commit -m <span class="s2">"Some message"</span>
+ <span class="c"># return to master</span>
+ git checkout master
+ <span class="c"># update master from upstream</span>
+ git pull -u -v
+
+ <span class="c"># create another branch from master for a quick-fix</span>
+ git checkout -b quickfix
+ <span class="c"># hack on quick fix</span>
+ <span class="c"># commit change to quick fix branch</span>
+ git commit -m <span class="s2">"Emergency Commit set"</span>
+ <span class="c"># return to master</span>
+ git checkout master
+ <span class="c"># check for changes from upstream.</span>
+ git pull -u -v
+ <span class="c"># Damn, updates happened.</span>
+ git checkout quickfix
+ <span class="c"># rebase quickfix on top of master</span>
+ git rebase -i master
+ git checkout master
+ <span class="c"># check again for upstream changes</span>
+ git pull -u -v
+ <span class="c"># Yay, no upstream changes, time to publish the changes in quickfix</span>
+ <span class="c"># --ff-only is good to prevent anarchy</span>
+ git merge --ff-only quickfix
+ git push upstream master
+ git branch -d quickfix
+
+ <span class="c"># return to work on updates</span>
+ git checkout updates
+ <span class="c"># move updates to be after master before continuing to hack</span>
+ git rebase -i master
+ <span class="c"># more hacking on updates</span>
+ git checkout master
+ <span class="c"># check for upstream changes</span>
+ git pull -u -v
+ <span class="c"># Yay, no upstream changes!</span>
+ git merge --ff-only updates
+ git push upstream master
+</pre></div></div></div>
+</div>
+</div>
+</div>
+<div id="footnotes"><hr/></div>
+<div id="footer">
+<div id="footer-text">
+Last updated 2010-09-29 12:41:58 NZDT
+</div>
+<div id="footer-badges">
+<a href="http://validator.w3.org/check?uri=referer">
+ <img style="border:0;width:88px;height:31px" src="http://www.w3.org/Icons/valid-xhtml11-blue" alt="Valid XHTML 1.1" height="31" width="88"/>
+</a>
+<a href="http://jigsaw.w3.org/css-validator/">
+ <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss-blue" alt="Valid CSS!"/>
+</a>
+<a href="http://www.mozilla.org/products/firefox/">
+ <img style="border:none; width:110px; height:32px;" src="http://www.spreadfirefox.com/community/images/affiliates/Buttons/110x32/safer.gif" alt="Get Firefox!"/>
+</a>
+</div>
+</div>
+</body>
+</html>
diff --git a/README/git-tips/work-in-a-branch.txt b/README/git-tips/work-in-a-branch.txt
new file mode 100644
index 000000000..c901b4559
--- /dev/null
+++ b/README/git-tips/work-in-a-branch.txt
@@ -0,0 +1,59 @@
+[[workinabranch]]
+Work In A Branch
+================
+
+Working in a branch instead of on `master` I have found to be a productive way
+to get things done with minimal interference from other commiters.
+
+Working this way lets you track upstream changes locally, update your local
+master, and work on multiple subjects simultaneously without any conflicts,
+and without being forced to perform a merge/rebase as soon as changes occur
+upstream.
+[source,bash]
+------------------------------------------------------------------------------------
+ git checkout master
+ # create a new branch to work in.
+ git checkout -b updates
+ # hack on updates.
+ # commit changes to update branch
+ git commit -m "Some message"
+ # return to master
+ git checkout master
+ # update master from upstream
+ git pull -u -v
+
+ # create another branch from master for a quick-fix
+ git checkout -b quickfix
+ # hack on quick fix
+ # commit change to quick fix branch
+ git commit -m "Emergency Commit set"
+ # return to master
+ git checkout master
+ # check for changes from upstream.
+ git pull -u -v
+ # Damn, updates happened.
+ git checkout quickfix
+ # rebase quickfix on top of master
+ git rebase -i master
+ git checkout master
+ # check again for upstream changes
+ git pull -u -v
+ # Yay, no upstream changes, time to publish the changes in quickfix
+ # --ff-only is good to prevent anarchy
+ git merge --ff-only quickfix
+ git push upstream master
+ git branch -d quickfix
+
+ # return to work on updates
+ git checkout updates
+ # move updates to be after master before continuing to hack
+ git rebase -i master
+ # more hacking on updates
+ git checkout master
+ # check for upstream changes
+ git pull -u -v
+ # Yay, no upstream changes!
+ git merge --ff-only updates
+ git push upstream master
+------------------------------------------------------------------------------------
+