summaryrefslogtreecommitdiff
path: root/Documentation/howto/rebase-from-internal-branch.txt
diff options
context:
space:
mode:
authorThomas Ackermann <th.acker66@arcor.de>2012-10-16 17:25:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-10-18 17:51:34 (GMT)
commit1797e5c50c00b514b798f7b0441c86ee71fb0fab (patch)
tree40835d0cb2880348613ba4763ff478a4b246bcca /Documentation/howto/rebase-from-internal-branch.txt
parent5316c8e9399dacd9e0f7c22132f3ad67186408ed (diff)
downloadgit-1797e5c50c00b514b798f7b0441c86ee71fb0fab.zip
git-1797e5c50c00b514b798f7b0441c86ee71fb0fab.tar.gz
git-1797e5c50c00b514b798f7b0441c86ee71fb0fab.tar.bz2
Documentation/howto: convert plain text files to asciidoc
These were not originally meant for asciidoc, but they are already so close. Mark them up in asciidoc. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto/rebase-from-internal-branch.txt')
-rw-r--r--Documentation/howto/rebase-from-internal-branch.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt
index 74a1c0c..4627ee4 100644
--- a/Documentation/howto/rebase-from-internal-branch.txt
+++ b/Documentation/howto/rebase-from-internal-branch.txt
@@ -8,7 +8,12 @@ Abstract: In this article, JC talks about how he rebases the
the "master" branch, and how "rebase" works. Also discussed
is how this applies to individual developers who sends patches
upstream.
+Content-type: text/asciidoc
+How to rebase from an internal branch
+=====================================
+
+--------------------------------------
Petr Baudis <pasky@suse.cz> writes:
> Dear diary, on Sun, Aug 14, 2005 at 09:57:13AM CEST, I got a letter
@@ -19,6 +24,7 @@ Petr Baudis <pasky@suse.cz> writes:
>> > branch to the real branches.
>>
> Actually, wouldn't this be also precisely for what StGIT is intended to?
+--------------------------------------
Exactly my feeling. I was sort of waiting for Catalin to speak
up. With its basing philosophical ancestry on quilt, this is
@@ -156,8 +162,3 @@ you continue on starting from the new "master" head, which is
the #1' commit.
-jc
-
--
-To unsubscribe from this list: send the line "unsubscribe git" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html