[med-svn] r14869 - trunk/community/website/docs

[Charles Plessy]

Author: plessy
Date: 2013-10-17 06:34:09 +0000 (Thu, 17 Oct 2013)
New Revision: 14869

Modified:
   trunk/community/website/docs/policy.xml
Log:
Simplify the part about tracking branches: one just needs to check them out.


Modified: trunk/community/website/docs/policy.xml
===================================================================
--- trunk/community/website/docs/policy.xml	2013-10-16 22:44:59 UTC (rev 14868)
+++ trunk/community/website/docs/policy.xml	2013-10-17 06:34:09 UTC (rev 14869)
@@ -371,15 +371,11 @@
 				<command>debcheckout</command> command with its
 				<command><option>--git-track='*'</option></command> option. 
 				</para>
-				<para>	To restrict	the tracked branch to the standard ones used by	<command>git-buildpackage</command>, <literal>master upstream
-				pristine-tar</literal> can be passed instead of the wildcard.</para>
 				<para>To update the <literal>upstream</literal>, <literal>master</literal> and <literal>pristine-tar</literal> branches at once, use the <command>gbp-pull</command>.</para>
 			</sect3>
 			<sect3 id="git-track-new-branches">
-				<title>Example commands to track new branches</title>
-				<para><programlisting>
-<command>git branch</command> <option>-t <replaceable>upstream</replaceable> <replaceable>origin/upstream</replaceable></option>
-<command>git branch</command> <option>-t <replaceable>pristine-tar</replaceable> <replaceable>origin/pristine-tar</replaceable></option></programlisting>
+				<title>To track extra upstream branches, simply check them out.</title>
+				<para>With recent versions of git, the remote branch will be automatically tracked when running <command>git</command> checkout.  For example, when a <literal>pristine-tar</literal> branch is available upstream and not yet tracked locally, the command <command>git checkout</command> <option><replaceable>pristine-tar</replaceable></option> will implicitely run the command <command>git branch</command> <option>-t <replaceable>pristine-tar</replaceable> <replaceable>origin/pristine-tar</replaceable></option>.
         </para>
   		</sect3>
 			<sect3 id="git-options-devscripts">