upstream/mercurial-mirror Files · mercurial/templates/monoblue/help.tmpl

backout: make help more explicit about what backout does...

backout: make help more explicit about what backout does The help for backout explains: The backout command merges the reverse effect of the reverted changeset into the working directory. Unfortunately, that does not make it obvious to a newcomer what the backout command does. Since it performs a 3-way merge, what is the common ancestor? Will the result be automatically committed? What is this reverted changeset --- is it the rev passed with -r on the command line or its inverse? So try to clarify the description, avoiding jargon and being explicit about what happens from the user's perspective. Thanks to Gilles Moris, Steve Borho, Kevin Bullock, and timeless for help.

Augie Fackler - - Load All Authors

File last commit:

r12666:ead4e21f default


                r13340:02aa06a0

stable

Download file

             help.tmpl
        
                    37 lines
            
             | 1.4 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / help.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

          <title>{repo|escape}: Branches</title>

          <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>

          <link rel="alternate" type="application/rss+xml" href="{url}rss-log" title="RSS feed for {repo|escape}"/>

      </head>

      <body>

      <div id="container">

          <div class="page-header">

              <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Branches</h1>

              <form action="{url}log">

                  {sessionvars%hiddenformentry}

                  <dl class="search">

                      <dt><label>Search: </label></dt>

                      <dd><input type="text" name="rev" /></dd>

                  </dl>

              </form>

              <ul class="page-nav">

                  <li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li>

                  <li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li>

                  <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>

                  <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>

                  <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>

                  <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>

                  <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>

      	    <li class="current">help</li>

              </ul>

          </div>

          <h2 class="no-link no-border">branches</h2>

          <pre>

          {doc|escape}

          </pre>

      {footer}

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				{header}
				<title>{repo\|escape}: Branches</title>
				<link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo\|escape}"/>
				<link rel="alternate" type="application/rss+xml" href="{url}rss-log" title="RSS feed for {repo\|escape}"/>
				</head>

				<body>
				<div id="container">
				<div class="page-header">
				<h1><a href="{url}summary{sessionvars%urlparameter}">{repo\|escape}</a> / Branches</h1>

				<form action="{url}log">
				{sessionvars%hiddenformentry}
				<dl class="search">
				<dt><label>Search: </label></dt>
				<dd><input type="text" name="rev" /></dd>
				</dl>
				</form>

				<ul class="page-nav">
				<li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li>
				<li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li>
				<li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
				<li><a href="{url}graph/{node\|short}{sessionvars%urlparameter}">graph</a></li>
				<li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
				<li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
				<li><a href="{url}file/{node\|short}{sessionvars%urlparameter}">files</a></li>
				<li class="current">help</li>
				</ul>
				</div>

				<h2 class="no-link no-border">branches</h2>
				<pre>
				{doc\|escape}
				</pre>

				{footer}