iframe-proxy | Sunbelt Computer Software

172 lines (149 loc) · 7.55 KB
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>Two and three dots in difference specs &mdash; Matplotlib 2.2.0 documentation</title>
    <link rel="stylesheet" href="../../_static/mpl.css"
type="text/css" />
    <link rel="stylesheet" href="../../_static/pygments.css"
type="text/css" />
    <link rel="stylesheet" href="../../_static/gallery.css" type="text/css" />
    <script type="text/javascript">
      var DOCUMENTATION_OPTIONS = {
        URL_ROOT:    '../../',
        VERSION:     '2.2.0',
        COLLAPSE_INDEX: false,
        FILE_SUFFIX: '.html',
        HAS_SOURCE:  true,
        SOURCELINK_SUFFIX: '.txt'
    </script>
    <script type="text/javascript" src="../../_static/jquery.js"></script>
    <script type="text/javascript" src="../../_static/underscore.js"></script>
    <script type="text/javascript" src="../../_static/doctools.js"></script>
    <link rel="search" type="application/opensearchdescription+xml"
          title="Search within Matplotlib 2.2.0 documentation"
          href="../../_static/opensearch.xml"/>
    <link rel="shortcut icon" href="../../_static/favicon.ico"/>
    <link rel="index" title="Index" href="../../genindex.html"
    <link rel="search" title="Search" href="../../search.html"
    <link rel="top" title="Matplotlib 2.2.0 documentation" href="../../index.html" />
    <link rel="up" title="Working with Matplotlib source code" href="index.html" />
    <link rel="next" title="Reviewers guideline" href="../coding_guide.html" />
    <link rel="prev" title="git resources" href="git_resources.html" />
  <link rel="canonical" href="https://matplotlib.org/stable/devel/gitwash/dot2_dot3.html" />
    <script data-domain="matplotlib.org" defer="defer" src="https://views.scientific-python.org/js/script.js"></script>
<div id="unreleased-message"> You are reading an old version of the documentation (v2.2.0).  For the latest version see <a href="https://matplotlib.org/stable/devel/gitwash/dot2_dot3.html">https://matplotlib.org/stable/devel/gitwash/dot2_dot3.html</a></div>
<div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px; position: relative;">
<a href="../../index.html">
    <div style="float: left; position: absolute; width: 496px; bottom: 0; padding-bottom: 24px"><span style="float: right; color: #789; background: white">Version 2.2.0</span></div>
    <img src="../../_static/logo2.png" height="125px" border="0" alt="matplotlib"/></a>
<!-- The "Fork me on github" ribbon -->
<div id="forkongithub"><a href="https://github.com/matplotlib/matplotlib">Fork me on GitHub</a></div>
    <div class="related">
      <h3>Navigation</h3>
        <li class="right" style="margin-right: 10px">
          <a href="../../genindex.html" title="General Index"
             accesskey="I">index</a></li>
        <li class="right" >
          <a href="../../py-modindex.html" title="Python Module Index"
             >modules</a> |</li>
        <li class="right" >
          <a href="../coding_guide.html" title="Reviewers guideline"
             accesskey="N">next</a> |</li>
        <li class="right" >
          <a href="git_resources.html" title="git resources"
             accesskey="P">previous</a> |</li>
        <li><a href="../../index.html">home</a>|&nbsp;</li>
        <li><a href="../../gallery/index.html">examples</a>|&nbsp;</li>
        <li><a href="../../tutorials/index.html">tutorials</a>|&nbsp;</li>
        <li><a href="../../api/pyplot_summary.html">pyplot</a>|&nbsp;</li>
        <li><a href="../../contents.html">docs</a> &raquo;</li>
          <li><a href="../index.html" >The Matplotlib Developers’ Guide</a> &raquo;</li>
          <li><a href="index.html" accesskey="U">Working with <em>Matplotlib</em> source code</a> &raquo;</li> 
      </ul>
      <div class="sphinxsidebar">
        <div class="sphinxsidebarwrapper"><div class="relations">
<h3>Related Topics</h3>
  <li><a href="../../contents.html">Documentation overview</a><ul>
  <li><a href="../index.html">The Matplotlib Developers’ Guide</a><ul>
  <li><a href="index.html">Working with <em>Matplotlib</em> source code</a><ul>
      <li>Previous: <a href="git_resources.html" title="previous chapter">git resources</a></li>
      <li>Next: <a href="../coding_guide.html" title="next chapter">Reviewers guideline</a></li>
  </ul></li>
  </ul></li>
  </ul></li>
  <div role="note" aria-label="source link">
    <h3>This Page</h3>
    <ul class="this-page-menu">
      <li><a href="../../_sources/devel/gitwash/dot2_dot3.rst.txt"
            rel="nofollow">Show Source</a></li>
<div id="searchbox" style="display: none" role="search">
  <h3>Quick search</h3>
    <div class="searchformwrapper">
    <form class="search" action="../../search.html" method="get">
      <input type="text" name="q" />
      <input type="submit" value="Go" />
      <input type="hidden" name="check_keywords" value="yes" />
      <input type="hidden" name="area" value="default" />
    </form>
<script type="text/javascript">$('#searchbox').show(0);</script>
        </div>
      </div>
    <div class="document">
      <div class="documentwrapper">
        <div class="bodywrapper">
          <div class="body">
  <div class="section" id="two-and-three-dots-in-difference-specs">
<span id="dot2-dot3"></span><h1>Two and three dots in difference specs<a class="headerlink" href="#two-and-three-dots-in-difference-specs" title="Permalink to this headline">¶</a></h1>
<p>Thanks to Yarik Halchenko for this explanation.</p>
<p>Imagine a series of commits A, B, C, D…  Imagine that there are two
branches, <em>topic</em> and <em>master</em>.  You branched <em>topic</em> off <em>master</em> when
<em>master</em> was at commit ‘E’.  The graph of the commits looks like this:</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>     <span class="n">A</span><span class="o">---</span><span class="n">B</span><span class="o">---</span><span class="n">C</span> <span class="n">topic</span>
     <span class="o">/</span>
<span class="n">D</span><span class="o">---</span><span class="n">E</span><span class="o">---</span><span class="n">F</span><span class="o">---</span><span class="n">G</span> <span class="n">master</span>
</pre></div>
<p>Then:</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">git</span> <span class="n">diff</span> <span class="n">master</span><span class="o">..</span><span class="n">topic</span>
</pre></div>
<p>will output the difference from G to C (i.e. with effects of F and G),
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">git</span> <span class="n">diff</span> <span class="n">master</span><span class="o">...</span><span class="n">topic</span>
</pre></div>
<p>would output just differences in the topic branch (i.e. only A, B, and
          </div>
        </div>
      </div>
      <div class="clearer"></div>
    <div class="footer">
        &copy; Copyright 2002 - 2012 John Hunter, Darren Dale, Eric Firing, Michael Droettboom and the Matplotlib development team; 2012 - 2017 The Matplotlib development team.
      Last updated on Mar 06, 2018.
      Created using <a
href="http://sphinx-doc.org/">Sphinx</a> 1.7.1.
Sunbelt Computer Software

PL/B Language Development and Support

Navigation Menu

Uh oh!

Sunbelt Computer Software

PL/B Language Development and Support

Uh oh!

FilesExpand file tree

dot2_dot3.html

Latest commit

History

dot2_dot3.html

File metadata and controls
