aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2017-06-16 14:34:49 +0200
committerGuido Günther <agx@sigxcpu.org>2017-06-16 14:34:49 +0200
commit57f2c4a5d9d5375279fa24009169ab27fbb5cccd (patch)
tree1659189c9664af981ff93fe5a4cb097e1d511a9d
parent4ae66b2f5f8dbf587843d9a5e246677be34ba242 (diff)
docs: simplify commands
-rw-r--r--docs/chapters/import.sgml6
1 files changed, 2 insertions, 4 deletions
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index fc722a8..0dfff40 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -149,8 +149,7 @@ by version number.
simple. You can either rename that branch to the default
<option>upstream-branch</option> name <emphasis>upstream</emphasis> with:
<programlisting>
- &gitcmd; branch upstream theupstream-branch
- &gitcmd; branch <option>-D</option> theupstream-branch
+ &gitcmd; branch -m upstream theupstream-branch
</programlisting>
or you can tell &gbp-buildpackage; the name of the branch to use as
<option>upstream-branch</option>:
@@ -174,8 +173,7 @@ EOF
point. So use &gitkcmd; or &gitcmd;-log to locate the commit-id of that commit
and create the upstream branch from there, e.g.:
<programlisting>
- COMMIT_ID=`&gitcmd; log --pretty=oneline | tail -1 | awk '{ print $1 }'`
- &gitcmd; branch upstream $COMMIT_ID
+ &gitcmd; branch upstream $(&gitcmd; log --format='%H' | tail -1)
</programlisting>
The important thing here is that the <envar>COMMIT_ID</envar> specifies a
point on the master branch that carried <emphasis>only</emphasis> the