From 63636e5fc93a42d22571ac836ff9fbfb24e108d9 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junio@hera.kernel.org>
Date: Sun, 12 Feb 2006 13:31:39 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.1.6-g5b766

---
 git-repo-config.html                | 21 +++++----
 git-repo-config.txt                 | 18 +++++---
 howto-index.html                    | 12 ++++-
 howto-index.txt                     |  5 ++
 howto/separating-topic-branches.txt | 91 +++++++++++++++++++++++++++++++++++++
 5 files changed, 131 insertions(+), 16 deletions(-)
 create mode 100644 howto/separating-topic-branches.txt
diff --git a/git-repo-config.html b/git-repo-config.html
index 23c55ae3..3d36447f 100644
--- a/git-repo-config.html
+++ b/git-repo-config.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -272,12 +272,12 @@ git-repo-config(1) Manual Page
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<p><em>git-repo-config</em> name [value [value_regex]]
-<em>git-repo-config</em> --replace-all name [value [value_regex]]
-<em>git-repo-config</em> --get name [value_regex]
-<em>git-repo-config</em> --get-all name [value_regex]
-<em>git-repo-config</em> --unset name [value_regex]
-<em>git-repo-config</em> --unset-all name [value_regex]</p>
+<p><em>git-repo-config</em> [type] name [value [value_regex]]
+<em>git-repo-config</em> [type] --replace-all name [value [value_regex]]
+<em>git-repo-config</em> [type] --get name [value_regex]
+<em>git-repo-config</em> [type] --get-all name [value_regex]
+<em>git-repo-config</em> [type] --unset name [value_regex]
+<em>git-repo-config</em> [type] --unset-all name [value_regex]</p>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -288,6 +288,11 @@ escaped.</p>
 should provide a POSIX regex for the value. If you want to handle the lines
 <strong>not</strong> matching the regex, just prepend a single exclamation mark in front
 (see EXAMPLES).</p>
+<p>The type specifier can be either <em>--int</em> or <em>--bool</em>, which will make
+<em>git-repo-config</em> ensure that the variable(s) are of the given type and
+convert the value to the canonical form (simple decimal number for int,
+a "true" or "false" string for bool). If no type specifier is passed,
+no checks or transformations are performed on the value.</p>
 <p>This command will fail if</p>
 <ol>
 <li>
@@ -476,7 +481,7 @@ i.e. the one without a "for &#8230;" postfix, do something like this:</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 06-Jan-2006 17:12:42 PDT
+Last updated 12-Feb-2006 13:31:35 UTC
 </div>
 </div>
 </body>
diff --git a/git-repo-config.txt b/git-repo-config.txt
index 30694641..33fcde45 100644
--- a/git-repo-config.txt
+++ b/git-repo-config.txt
@@ -8,12 +8,12 @@ git-repo-config - Get and set options in .git/config.
 
 SYNOPSIS
 --------
-'git-repo-config' name [value [value_regex]]
-'git-repo-config' --replace-all name [value [value_regex]]
-'git-repo-config' --get name [value_regex]
-'git-repo-config' --get-all name [value_regex]
-'git-repo-config' --unset name [value_regex]
-'git-repo-config' --unset-all name [value_regex]
+'git-repo-config' [type] name [value [value_regex]]
+'git-repo-config' [type] --replace-all name [value [value_regex]]
+'git-repo-config' [type] --get name [value_regex]
+'git-repo-config' [type] --get-all name [value_regex]
+'git-repo-config' [type] --unset name [value_regex]
+'git-repo-config' [type] --unset-all name [value_regex]
 
 DESCRIPTION
 -----------
@@ -26,6 +26,12 @@ should provide a POSIX regex for the value. If you want to handle the lines
 *not* matching the regex, just prepend a single exclamation mark in front
 (see EXAMPLES).
 
+The type specifier can be either '--int' or '--bool', which will make
+'git-repo-config' ensure that the variable(s) are of the given type and
+convert the value to the canonical form (simple decimal number for int,
+a "true" or "false" string for bool). If no type specifier is passed,
+no checks or transformations are performed on the value.
+
 This command will fail if
 
 . .git/config is invalid,
diff --git a/howto-index.html b/howto-index.html
index b7056b0d..77ecab28 100644
--- a/howto-index.html
+++ b/howto-index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -332,6 +332,14 @@ and easier sanity checking.</p>
 <ul>
 <li>
 <p>
+<a href="howto/separating-topic-branches.txt">separating-topic-branches</a> by Junio C Hamano &lt;junkio@cox.net&gt;
+</p>
+</li>
+</ul>
+<p>In this article, JC describes how to separate topic branches.</p>
+<ul>
+<li>
+<p>
 <a href="howto/update-hook-example.txt">update-hook-example</a> by Junio C Hamano &lt;junkio@cox.net&gt; and Carl Baldwin &lt;cnb@fc.hp.com&gt;
 </p>
 </li>
@@ -352,7 +360,7 @@ as a Linux subsystem maintainer.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 20-Jan-2006 23:50:28 PDT
+Last updated 12-Feb-2006 13:31:35 UTC
 </div>
 </div>
 </body>
diff --git a/howto-index.txt b/howto-index.txt
index 7487e4f6..f9b0d648 100644
--- a/howto-index.txt
+++ b/howto-index.txt
@@ -50,6 +50,11 @@ In this article, JC gives a small real-life example of using
 and easier sanity checking.
 
 
+* link:howto/separating-topic-branches.txt[separating-topic-branches] by Junio C Hamano <junkio@cox.net>
+
+In this article, JC describes how to separate topic branches.
+
+
 * link:howto/update-hook-example.txt[update-hook-example] by Junio C Hamano <junkio@cox.net> and Carl Baldwin <cnb@fc.hp.com>
 
 An example hooks/update script is presented to
diff --git a/howto/separating-topic-branches.txt b/howto/separating-topic-branches.txt
new file mode 100644
index 00000000..090e2c9b
--- /dev/null
+++ b/howto/separating-topic-branches.txt
@@ -0,0 +1,91 @@
+From: Junio C Hamano <junkio@cox.net>
+Subject: Separating topic branches
+Abstract: In this article, JC describes how to separate topic branches.
+
+This text was originally a footnote to a discussion about the
+behaviour of the git diff commands.
+
+Often I find myself doing that [running diff against something other
+than HEAD] while rewriting messy development history.  For example, I
+start doing some work without knowing exactly where it leads, and end
+up with a history like this:
+
+            "master"
+        o---o
+             \                    "topic" 
+              o---o---o---o---o---o
+
+At this point, "topic" contains something I know I want, but it
+contains two concepts that turned out to be completely independent.
+And often, one topic component is larger than the other.  It may
+contain more than two topics.
+
+In order to rewrite this mess to be more manageable, I would first do
+"diff master..topic", to extract the changes into a single patch, start
+picking pieces from it to get logically self-contained units, and
+start building on top of "master":
+
+        $ git diff master..topic >P.diff
+        $ git checkout -b topicA master
+        ... pick and apply pieces from P.diff to build
+        ... commits on topicA branch.
+                      
+              o---o---o
+             /        "topicA"
+        o---o"master"
+             \                    "topic" 
+              o---o---o---o---o---o
+
+Before doing each commit on "topicA" HEAD, I run "diff HEAD"
+before update-index the affected paths, or "diff --cached HEAD"
+after.  Also I would run "diff --cached master" to make sure
+that the changes are only the ones related to "topicA".  Usually
+I do this for smaller topics first.
+
+After that, I'd do the remainder of the original "topic", but
+for that, I do not start from the patchfile I extracted by
+comparing "master" and "topic" I used initially.  Still on
+"topicA", I extract "diff topic", and use it to rebuild the
+other topic:
+
+        $ git diff -R topic >P.diff ;# --cached also would work fine
+        $ git checkout -b topicB master
+        ... pick and apply pieces from P.diff to build
+        ... commits on topicB branch.
+
+                                "topicB"
+               o---o---o---o---o
+              /
+             /o---o---o
+            |/        "topicA"
+        o---o"master"
+             \                    "topic" 
+              o---o---o---o---o---o
+
+After I am done, I'd try a pretend-merge between "topicA" and
+"topicB" in order to make sure I have not missed anything:
+
+        $ git pull . topicA ;# merge it into current "topicB"
+        $ git diff topic
+                                "topicB"
+               o---o---o---o---o---* (pretend merge)
+              /                   /
+             /o---o---o----------'
+            |/        "topicA"
+        o---o"master"
+             \                    "topic" 
+              o---o---o---o---o---o
+
+The last diff better not to show anything other than cleanups
+for crufts.  Then I can finally clean things up:
+
+        $ git branch -D topic
+        $ git reset --hard HEAD^ ;# nuke pretend merge
+
+                                "topicB"
+               o---o---o---o---o
+              / 
+             /o---o---o
+            |/        "topicA"
+        o---o"master"
+
-- 
2.11.0

