Package: git-buildpackage Version: 0.5.19 Severity: wishlist Tags: patch Dear Guido,
in echo to #471560, here are two patches for docs/chapters/import.sgml. The first adds some markup similar to the example in the neighboring section. The seconds adds a simpler example for the creation of empty upstream branches. It has the same number of lines, but I find it easier to remember. It needs a Git version of 1.7.2.3 at least. Have a nice day, -- Charles Plessy Tsurumi, Kanagawa, Japan
>From 659b1267c0a036e53b2bc73109f7f87601f5f3a8 Mon Sep 17 00:00:00 2001 From: Charles Plessy <[email protected]> Date: Mon, 21 Mar 2011 11:16:23 +0900 Subject: [PATCH 1/2] Added markup to the example for creating upstream branch. --- docs/chapters/import.sgml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml index cbb8804..c989317 100644 --- a/docs/chapters/import.sgml +++ b/docs/chapters/import.sgml @@ -142,10 +142,10 @@ EOF mergeWithUpstream was set for svn-buildpackage), you can create an empty upstream branch with the following commands: <screen> - git symbolic-ref HEAD refs/heads/upstream - git rm --cached -r . - git commit --allow-empty -m 'Initial upstream branch.' - git checkout -f master + <command>git symbolic-ref</command> <replaceable>HEAD</replaceable> <replaceable>refs/heads/upstream</replaceable> + <command>git rm</command> <option>--cached</option> <option>-r</option> <replaceable>.</replaceable> + <command>git commit</command> <option>--allow-empty</option> <option>-m</option> <replaceable>'Initial upstream branch.'</replaceable> + <command>git checkout</command> <option>-f</option> <replaceable>master</replaceable> </screen> </para> </sect2> -- 1.7.2.5
>From 386ee90b4f88b81250808971be644b9b321a4a23 Mon Sep 17 00:00:00 2001 From: Charles Plessy <[email protected]> Date: Mon, 21 Mar 2011 11:19:58 +0900 Subject: [PATCH 2/2] # Easier to remember commands to create orphan upstream branch. --- docs/chapters/import.sgml | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml index c989317..c4a5f1f 100644 --- a/docs/chapters/import.sgml +++ b/docs/chapters/import.sgml @@ -142,6 +142,13 @@ EOF mergeWithUpstream was set for svn-buildpackage), you can create an empty upstream branch with the following commands: <screen> + <command>git checkout</command> <option>--orphan</option> <replaceable>upstream</replaceable> + <command>git rm</command> <option>-rf</option> <replaceable>.</replaceable> + <command>git commit</command> <option>--allow-empty</option> <option>-m</option> <replaceable>'Initial upstream branch.'</replaceable> + <command>git checkout</command> <option>-f</option> <replaceable>master</replaceable> +</screen> + With Git versions lower than 1.7.2.3, the commands are slightly more complicated: +<screen> <command>git symbolic-ref</command> <replaceable>HEAD</replaceable> <replaceable>refs/heads/upstream</replaceable> <command>git rm</command> <option>--cached</option> <option>-r</option> <replaceable>.</replaceable> <command>git commit</command> <option>--allow-empty</option> <option>-m</option> <replaceable>'Initial upstream branch.'</replaceable> -- 1.7.2.5
