OLD | NEW |
---|---|
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-upstream-diff(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 |
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
798 <div class="dlist"><dl> | 798 <div class="dlist"><dl> |
799 <dt class="hdlist1"> | 799 <dt class="hdlist1"> |
800 --wordwise | 800 --wordwise |
801 </dt> | 801 </dt> |
802 <dd> | 802 <dd> |
803 <p> | 803 <p> |
804 Print a colorized word-wise diff instead of a line-wise diff. | 804 Print a colorized word-wise diff instead of a line-wise diff. |
805 </p> | 805 </p> |
806 </dd> | 806 </dd> |
807 <dt class="hdlist1"> | 807 <dt class="hdlist1"> |
808 --HEAD | |
809 </dt> | |
810 <dd> | |
811 <p> | |
812 Diff against the committed HEAD of your branch instead of your working copy. | |
813 This is <em>substantially</em> faster on large repos, but doesn’t take i nto account | |
814 uncommitted changes. | |
szager1
2014/05/07 06:48:32
unstaged and uncommitted changes.
| |
815 </p> | |
816 </dd> | |
817 <dt class="hdlist1"> | |
808 <extra args for git-diff> | 818 <extra args for git-diff> |
809 </dt> | 819 </dt> |
810 <dd> | 820 <dd> |
811 <p> | 821 <p> |
812 Extra arguments are included in the invocation of <a href="git-diff.html">git- diff(1)</a>. These | 822 Extra arguments are included in the invocation of <a href="git-diff.html">git- diff(1)</a>. These |
813 can be anything that <code>git-diff</code> normally takes. | 823 can be anything that <code>git-diff</code> normally takes. |
814 </p> | 824 </p> |
815 <div class="openblock"> | 825 <div class="openblock"> |
816 <div class="content"> | 826 <div class="content"> |
817 <div class="dlist"><dl> | 827 <div class="dlist"><dl> |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
873 <div class="sectionbody"> | 883 <div class="sectionbody"> |
874 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to | 884 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to |
875 assist with the development of chromium and related projects. Download the tools | 885 assist with the development of chromium and related projects. Download the tools |
876 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> | 886 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> |
877 </div> | 887 </div> |
878 </div> | 888 </div> |
879 </div> | 889 </div> |
880 <div id="footnotes"><hr /></div> | 890 <div id="footnotes"><hr /></div> |
881 <div id="footer"> | 891 <div id="footer"> |
882 <div id="footer-text"> | 892 <div id="footer-text"> |
883 Last updated 2014-04-10 14:23:11 PDT | 893 Last updated 2014-05-06 10:34:26 PDT |
884 </div> | 894 </div> |
885 </div> | 895 </div> |
886 </body> | 896 </body> |
887 </html> | 897 </html> |
OLD | NEW |