summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Fredric <kentfredric@gmail.com>2010-09-29 13:36:20 +1300
committerKent Fredric <kentfredric@gmail.com>2010-09-29 13:36:20 +1300
commit1338f4f509f3311734edc974515d16a737977684 (patch)
tree34550fb5c53098edcaebc435afc0608e9da9d231
parent[doc] reorganise doc to be more logical (diff)
downloadperl-overlay-1338f4f509f3311734edc974515d16a737977684.tar.gz
perl-overlay-1338f4f509f3311734edc974515d16a737977684.tar.bz2
perl-overlay-1338f4f509f3311734edc974515d16a737977684.zip
[doc] + merge option --ff-only
-rw-r--r--README/index.html56
-rw-r--r--README/index.txt1
-rw-r--r--README/src/git/contribution-order.html2
-rw-r--r--README/src/git/disable-merge-pull.html672
-rw-r--r--README/src/git/disable-merge-pull.txt36
-rw-r--r--README/src/git/linearize-commits.html2
-rw-r--r--README/src/git/repositories.html2
-rw-r--r--README/src/git/work-in-a-branch.html2
-rw-r--r--README/src/networks.html2
9 files changed, 769 insertions, 6 deletions
diff --git a/README/index.html b/README/index.html
index ade3b8fb7..172692da5 100644
--- a/README/index.html
+++ b/README/index.html
@@ -884,13 +884,67 @@ upstream.</p></div>
git push upstream master
</pre></div></div></div>
</div>
+<div class="sect2">
+<h3 id="_disable_merge_pull">2.5. Disable Merge Pull</h3>
+<div class="paragraph"><p>When you&#x2019;re trying to keep things linear by rebasing, it can be frustrating
+when the following happens:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+You commit to master.
+</p>
+</li>
+<li>
+<p>
+You push to upstream.
+</p>
+</li>
+<li>
+<p>
+Upstream has been updated.
+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p>In this scenario you have 3 choices.</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+<em>(not recommended)</em> : force push, clobbering upstreams changes
+</p>
+</li>
+<li>
+<p>
+<em>(not recommended)</em> : merge pull
+</p>
+</li>
+<li>
+<p>
+<em>(recommended)</em> : rebase pull ( <tt>git pull --rebase</tt> )
+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p>Generally, you want option 3.</p></div>
+<div class="paragraph"><p>However, if you&#x2019;re anything like me, either a rebase or a merge occuring
+during pull scares you, and you&#x2019;d rather <em>choose</em> to trigger that behaviour,
+and you would not want to accidentally merge.</p></div>
+<div class="paragraph"><p>I do this by disabling non-fastforward merges.</p></div>
+<div class="paragraph"><p>This means that instead of a magical merge, or an automatic rebase, it will
+simply complain that a fast-forward cannot occur, and then stops, letting you
+resolve the situation.</p></div>
+<div class="listingblock">
+<div class="content"><div class="highlight"><pre> <span class="k">[branch "master"]</span>
+ <span class="na">remote</span> <span class="o">=</span> <span class="s">origin</span>
+ <span class="na">merge</span> <span class="o">=</span> <span class="s">refs/heads/master</span>
+ <span class="na">mergeoptions</span> <span class="o">=</span> <span class="s">--ff-only</span>
+</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 13:08:08 NZDT
+Last updated 2010-09-29 13:27:58 NZDT
</div>
<div id="footer-badges">
<a href="http://validator.w3.org/check?uri=referer">
diff --git a/README/index.txt b/README/index.txt
index 2c9d9fa5c..ed4518e4b 100644
--- a/README/index.txt
+++ b/README/index.txt
@@ -13,3 +13,4 @@ include::src/git/repositories.txt[]
include::src/git/contribution-order.txt[]
include::src/git/linearize-commits.txt[]
include::src/git/work-in-a-branch.txt[]
+include::src/git/disable-merge-pull.txt[]
diff --git a/README/src/git/contribution-order.html b/README/src/git/contribution-order.html
index cc5ce9347..ed54e6694 100644
--- a/README/src/git/contribution-order.html
+++ b/README/src/git/contribution-order.html
@@ -657,7 +657,7 @@ linearize commits. See <a href="linearize_commits.txt">Linearizing Commits</a></
<div id="footnotes"><hr/></div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-29 09:22:59 NZDT
+Last updated 2010-09-29 13:17:57 NZDT
</div>
<div id="footer-badges">
<a href="http://validator.w3.org/check?uri=referer">
diff --git a/README/src/git/disable-merge-pull.html b/README/src/git/disable-merge-pull.html
new file mode 100644
index 000000000..ed395f984
--- /dev/null
+++ b/README/src/git/disable-merge-pull.html
@@ -0,0 +1,672 @@
+<?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>Disable Merge Pull</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>Disable Merge Pull</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"><p>When you&#x2019;re trying to keep things linear by rebasing, it can be frustrating
+when the following happens:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+You commit to master.
+</p>
+</li>
+<li>
+<p>
+You push to upstream.
+</p>
+</li>
+<li>
+<p>
+Upstream has been updated.
+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p>In this scenario you have 3 choices.</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+<em>(not recommended)</em> : force push, clobbering upstreams changes
+</p>
+</li>
+<li>
+<p>
+<em>(not recommended)</em> : merge pull
+</p>
+</li>
+<li>
+<p>
+<em>(recommended)</em> : rebase pull ( <tt>git pull --rebase</tt> )
+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p>Generally, you want option 3.</p></div>
+<div class="paragraph"><p>However, if you&#x2019;re anything like me, either a rebase or a merge occuring
+during pull scares you, and you&#x2019;d rather <em>choose</em> to trigger that behaviour,
+and you would not want to accidentally merge.</p></div>
+<div class="paragraph"><p>I do this by disabling non-fastforward merges.</p></div>
+<div class="paragraph"><p>This means that instead of a magical merge, or an automatic rebase, it will
+simply complain that a fast-forward cannot occur, and then stops, letting you
+resolve the situation.</p></div>
+<div class="listingblock">
+<div class="content"><div class="highlight"><pre> <span class="k">[branch "master"]</span>
+ <span class="na">remote</span> <span class="o">=</span> <span class="s">origin</span>
+ <span class="na">merge</span> <span class="o">=</span> <span class="s">refs/heads/master</span>
+ <span class="na">mergeoptions</span> <span class="o">=</span> <span class="s">--ff-only</span>
+</pre></div></div></div>
+</div>
+</div>
+</div>
+<div id="footnotes"><hr/></div>
+<div id="footer">
+<div id="footer-text">
+Last updated 2010-09-29 13:28:57 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/src/git/disable-merge-pull.txt b/README/src/git/disable-merge-pull.txt
new file mode 100644
index 000000000..03cdfa6a5
--- /dev/null
+++ b/README/src/git/disable-merge-pull.txt
@@ -0,0 +1,36 @@
+Disable Merge Pull
+==================
+
+When you're trying to keep things linear by rebasing, it can be frustrating
+when the following happens:
+
+ 1. You commit to master.
+ 2. You push to upstream.
+ 3. Upstream has been updated.
+
+In this scenario you have 3 choices.
+
+ 1. _(not recommended)_ : force push, clobbering upstreams changes
+ 2. _(not recommended)_ : merge pull
+ 3. _(recommended)_ : rebase pull ( `git pull --rebase` )
+
+Generally, you want option 3.
+
+However, if you're anything like me, either a rebase or a merge occuring
+during pull scares you, and you'd rather _choose_ to trigger that behaviour,
+and you would not want to accidentally merge.
+
+I do this by disabling non-fastforward merges.
+
+This means that instead of a magical merge, or an automatic rebase, it will
+simply complain that a fast-forward cannot occur, and then stops, letting you
+resolve the situation.
+
+[source,ini]
+------------------------------
+ [branch "master"]
+ remote = origin
+ merge = refs/heads/master
+ mergeoptions = --ff-only
+------------------------------
+
diff --git a/README/src/git/linearize-commits.html b/README/src/git/linearize-commits.html
index 82808b6c2..d215dd26a 100644
--- a/README/src/git/linearize-commits.html
+++ b/README/src/git/linearize-commits.html
@@ -691,7 +691,7 @@ Kent Fredric
<div id="footnotes"><hr/></div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-29 12:43:43 NZDT
+Last updated 2010-09-29 13:17:57 NZDT
</div>
<div id="footer-badges">
<a href="http://validator.w3.org/check?uri=referer">
diff --git a/README/src/git/repositories.html b/README/src/git/repositories.html
index e1fb6f2c1..83e2d6993 100644
--- a/README/src/git/repositories.html
+++ b/README/src/git/repositories.html
@@ -671,7 +671,7 @@ ReadWrite
<div id="footnotes"><hr/></div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-29 09:22:59 NZDT
+Last updated 2010-09-29 13:17:57 NZDT
</div>
<div id="footer-badges">
<a href="http://validator.w3.org/check?uri=referer">
diff --git a/README/src/git/work-in-a-branch.html b/README/src/git/work-in-a-branch.html
index b02e9455b..59231b6da 100644
--- a/README/src/git/work-in-a-branch.html
+++ b/README/src/git/work-in-a-branch.html
@@ -655,7 +655,7 @@ upstream.</p></div>
<div id="footnotes"><hr/></div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-29 12:43:43 NZDT
+Last updated 2010-09-29 13:17:57 NZDT
</div>
<div id="footer-badges">
<a href="http://validator.w3.org/check?uri=referer">
diff --git a/README/src/networks.html b/README/src/networks.html
index 3323a2ed5..b411868a3 100644
--- a/README/src/networks.html
+++ b/README/src/networks.html
@@ -619,7 +619,7 @@ on <tt>irc.freenode.org</tt></p></div>
<div id="footnotes"><hr/></div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-29 09:22:59 NZDT
+Last updated 2010-09-29 13:17:57 NZDT
</div>
<div id="footer-badges">
<a href="http://validator.w3.org/check?uri=referer">