aboutsummaryrefslogtreecommitdiff
path: root/docs/chapters
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2007-02-01 17:57:56 +0100
committerGuido Guenther <agx@bogon.sigxcpu.org>2007-02-01 17:57:56 +0100
commitf13aa17422239db950ec53cbbc15d2636f819338 (patch)
tree81d4abfa757174ed6fbf064762a22b4bc351e8c1 /docs/chapters
parent55664883c7d0a6f42a672eca947c908cfae971e1 (diff)
mention grafts
Diffstat (limited to 'docs/chapters')
-rw-r--r--docs/chapters/import.sgml15
1 files changed, 10 insertions, 5 deletions
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index 1b754d6..8ba1719 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -58,7 +58,7 @@ upstream-branch=theupstream-branch
<sect2>
<title>Upstream sources not on a branch</title>
<para>
- If you don't have an upstream branch but started you repository with only
+ If you don't have an upstream branch but started your repository with only
the upstream sources (not the debian patch) you can simply branch from that
point. So use &gitkcmd; or &gitcmd;-log to locate the commit-id of that commit
and create the upstream branch from there, e.g.:
@@ -71,10 +71,15 @@ upstream-branch=theupstream-branch
upstream sources and not the debian modifications. The above example
assumes that this was the first commit to that repository.
</para>
- <warning><para>There's currently no easy way to use &git-import-orig; with
- a repository that never had the upstream sources as a single commit. Using
- it on such repositories might lead to unexpected merge results. You can use
- <command>git_load_dirs</command> instead.</para></warning>
+ <warning><para>There's currently no <emphasis>easy</emphasis> way to create the
+ <emphasis>upstream</emphasis> branch if you never had the upstream sources
+ as a single commit. Using &git-import-orig; on such repositories might lead
+ to unexpected merge results.</para></warning>
+ <para>In order to fix this you can prepend the upstream sources as a
+ single commit to your tree using &git;'s <ulink
+ url="http://git.or.cz/gitwiki/GraftPoint">grafts</ulink>. Afterwards you
+ can simply create a branch as explained above and &git-import-orig; should
+ work as expected.</para>
</sect2>
</sect1>
</chapter>