Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: docs/html/git-upstream-diff.html

Issue 184253003: Add git-reup and friends (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@freeze_thaw
Patch Set: fix pylint Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « docs/html/git-thaw.html ('k') | docs/man1/depot_tools.1 » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> 2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> 3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4 <head> 4 <head>
5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" / > 5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" / >
6 <meta name="generator" content="AsciiDoc 8.6.9" /> 6 <meta name="generator" content="AsciiDoc 8.6.9" />
7 <title>git-map-branches(1)</title> 7 <title>git-upstream-diff(1)</title>
8 <style type="text/css"> 8 <style type="text/css">
9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ 9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
10 10
11 /* Default font. */ 11 /* Default font. */
12 body { 12 body {
13 font-family: Georgia,serif; 13 font-family: Georgia,serif;
14 } 14 }
15 15
16 /* Title font. */ 16 /* Title font. */
17 h1, h2, h3, h4, h5, h6, 17 h1, h2, h3, h4, h5, h6,
(...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 } 734 }
735 735
736 } 736 }
737 asciidoc.install(); 737 asciidoc.install();
738 /*]]>*/ 738 /*]]>*/
739 </script> 739 </script>
740 </head> 740 </head>
741 <body class="manpage"> 741 <body class="manpage">
742 <div id="header"> 742 <div id="header">
743 <h1> 743 <h1>
744 git-map-branches(1) Manual Page 744 git-upstream-diff(1) Manual Page
745 </h1> 745 </h1>
746 <h2>NAME</h2> 746 <h2>NAME</h2>
747 <div class="sectionbody"> 747 <div class="sectionbody">
748 <p>git-map-branches - 748 <p>git-upstream-diff -
749 Helper script to display all local git branches with ‘upstream’ hierarchy in colorized terminal format. 749 Print a diff of the current branch, compared to its upstream.
750 </p> 750 </p>
751 </div> 751 </div>
752 </div> 752 </div>
753 <div id="content"> 753 <div id="content">
754 <div class="sect1"> 754 <div class="sect1">
755 <h2 id="_synopsis">SYNOPSIS</h2> 755 <h2 id="_synopsis">SYNOPSIS</h2>
756 <div class="sectionbody"> 756 <div class="sectionbody">
757 <div class="verseblock"> 757 <div class="verseblock">
758 <pre class="content"><em>git map-branches</em></pre> 758 <pre class="content"><em>git upstream-diff</em> [--wordwise] [&lt;extra args for git-diff&gt;*]</pre>
759 <div class="attribution"> 759 <div class="attribution">
760 </div></div> 760 </div></div>
761 </div> 761 </div>
762 </div> 762 </div>
763 <div class="sect1"> 763 <div class="sect1">
764 <h2 id="_description">DESCRIPTION</h2> 764 <h2 id="_description">DESCRIPTION</h2>
765 <div class="sectionbody"> 765 <div class="sectionbody">
766 <div class="paragraph"><p>Git map-branches displays all local branches such that :</p></div> 766 <div class="paragraph"><p>Shows a diff beween your current branch and it&#8217;s upstream. This is <em>roughly</em> the
767 <div class="ulist"><ul> 767 same as:</p></div>
768 <div class="listingblock">
769 <div class="content">
770 <pre><code>git diff --patience -C -C HEAD@{upstream} <b>&lt;1&gt;</b> <b>&lt;2& gt;</b></code></pre>
771 </div></div>
772 <div class="colist arabic"><ol>
768 <li> 773 <li>
769 <p> 774 <p>
770 Current branch is <span class="aqua">cyan</span>. 775 <code>-C -C</code> detects file copies/renames
771 </p>
772 <div class="ulist"><ul>
773 <li>
774 <p>
775 The branch which will be modified with git-commit is denoted with an asterisk
776 (<code>*</code>) after the name.
777 </p>
778 </li>
779 </ul></div>
780 </li>
781 <li>
782 <p>
783 Local branches are <span class="green">green</span>.
784 </p> 776 </p>
785 </li> 777 </li>
786 <li> 778 <li>
787 <p> 779 <p>
788 Remote branches are <span class="red">red</span> (usually, the root of all other branches). 780 <code>--patience</code> uses the patience-diff algorithm, which tends to produce nicer
781 diffs in many cases.
789 </p> 782 </p>
790 </li> 783 </li>
791 <li> 784 </ol></div>
785 <div class="paragraph"><p>The difference is that <code>HEAD@{upstream}</code> is actually the tagged merge base of
786 your branch (See <a href="git-rebase-update.html">git-rebase-update(1)</a>). Thi s means that if your upstream
787 branch was rebased, but you haven&#8217;t yet rebased the current branch on top of it,
788 you&#8217;ll still see an accurate diff compared to just diffing against
789 <code>@{upstream}</code>.</p></div>
790 <div class="paragraph"><p>The <code>--wordwise</code> option also allows <code>g it-diff</code> to do word-by-word comparison
791 in a semi-intelligent way. However, sometimes it can produce surprising results,
792 so it is disabled by default.</p></div>
793 </div>
794 </div>
795 <div class="sect1">
796 <h2 id="_options">OPTIONS</h2>
797 <div class="sectionbody">
798 <div class="dlist"><dl>
799 <dt class="hdlist1">
800 --wordwise
801 </dt>
802 <dd>
792 <p> 803 <p>
793 <code>{NO UPSTREAM}</code> is a special placeholder in <span class="fuchsia">mag enta</span>. 804 Print a colorized word-wise diff instead of a line-wise diff.
794 </p> 805 </p>
795 <div class="ulist"><ul> 806 </dd>
796 <li> 807 <dt class="hdlist1">
808 &lt;extra args for git-diff&gt;
809 </dt>
810 <dd>
797 <p> 811 <p>
798 Branches which have this as their parent are usually misconfigured, and 812 Extra arguments are included in the invocation of <a href="git-diff.html">git- diff(1)</a>. These
799 should be assigned a parent by checking out the branch and running git branch 813 can be anything that <code>git-diff</code> normally takes.
800 --set-upstream-to=&lt;correct parent branch&gt;.
801 </p> 814 </p>
802 </li> 815 <div class="openblock">
803 </ul></div> 816 <div class="content">
804 </li> 817 <div class="dlist"><dl>
805 </ul></div> 818 <dt class="hdlist1">
806 <div class="admonitionblock"> 819 <code>--stat</code>
807 <table><tr> 820 </dt>
808 <td class="icon"> 821 <dd>
809 <div class="title">Note</div> 822 <p>
810 </td> 823 This is particularly useful to show <em>which</em> files have been changed in
811 <td class="content">If multiple branches are on the same commit, they will all b e cyan.</td> 824 comparison to the upstream branch.
812 </tr></table> 825 </p>
826 </dd>
827 <dt class="hdlist1">
828 <code>-- &lt;filename patterns&gt;*</code>
829 </dt>
830 <dd>
831 <p>
832 Restrict the diff to only show the diff for given files compared to the
833 upstream.
834 </p>
835 </dd>
836 </dl></div>
837 </div></div>
838 </dd>
839 </dl></div>
840 </div>
841 </div>
842 <div class="sect1">
843 <h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2>
844 <div class="sectionbody">
845 <div class="sect2">
846 <h3 id="_depot_tools_upstream_diff_default_args">depot-tools.upstream-diff.defau lt-args</h3>
847 <div class="paragraph"><p>A list-configuration variable. Each instance of this c onfig variable will be
848 prepended to all invocations of <code>git upstream-diff</code>, as if you had pa ssed them
849 on the command line.</p></div>
813 </div> 850 </div>
814 </div> 851 </div>
815 </div> 852 </div>
816 <div class="sect1"> 853 <div class="sect1">
817 <h2 id="_example">EXAMPLE</h2> 854 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>
818 <div class="sectionbody"> 855 <div class="sectionbody">
819 <div class="paragraph"><p>Given the hypothetical demo repo in <a href="git-map.h tml">git-map(1)</a>'s EXAMPLE section, and 856 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>
820 assuming that the <code>frozen_changes</code> branch was currently checked out, running 857 file.</p></div>
821 <em>git map-branches</em> would result in an output like:</p></div>
822 <div class="listingblock"> 858 <div class="listingblock">
823 <div class="content"> 859 <div class="content">
824 <pre><code><strong><span class="white">$ git map-branches</span></strong> 860 <pre><code>[alias]
825 <span class="red">origin/master</span> 861 git udiff = upstream-diff</code></pre>
826 <span class="green">cool_feature</span>
827 <span class="green">subfeature</span>
828 <span class="aqua">frozen_changes *</span>
829 <span class="green">master</span>
830 <span class="fuchsia">{NO UPSTREAM}</span>
831 <span class="green">bogus_noparent</span>
832 <span class="aqua">duplicate_cool_feature_no_upstream</span></code></pre>
833 </div></div> 862 </div></div>
834 </div> 863 </div>
835 </div> 864 </div>
836 <div class="sect1"> 865 <div class="sect1">
837 <h2 id="_see_also">SEE ALSO</h2> 866 <h2 id="_see_also">SEE ALSO</h2>
838 <div class="sectionbody"> 867 <div class="sectionbody">
839 <div class="paragraph"><p><a href="git-map.html">git-map(1)</a></p></div> 868 <div class="paragraph"><p><a href="git-rebase-update.html">git-rebase-update(1)< /a></p></div>
840 </div> 869 </div>
841 </div> 870 </div>
842 <div class="sect1"> 871 <div class="sect1">
843 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 872 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
844 <div class="sectionbody"> 873 <div class="sectionbody">
845 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(1)</a> suite. These tools are meant to 874 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(1)</a> suite. These tools are meant to
846 assist with the development of chromium and related projects. Download the tools 875 assist with the development of chromium and related projects. Download the tools
847 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 876 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
848 </div> 877 </div>
849 </div> 878 </div>
850 </div> 879 </div>
851 <div id="footnotes"><hr /></div> 880 <div id="footnotes"><hr /></div>
852 <div id="footer"> 881 <div id="footer">
853 <div id="footer-text"> 882 <div id="footer-text">
854 Last updated 2014-03-14 14:01:10 PDT 883 Last updated 2014-03-25 15:03:05 PDT
855 </div> 884 </div>
856 </div> 885 </div>
857 </body> 886 </body>
858 </html> 887 </html>
OLDNEW
« no previous file with comments | « docs/html/git-thaw.html ('k') | docs/man1/depot_tools.1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698