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 807 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
818 <dt class="hdlist1"> | 818 <dt class="hdlist1"> |
819 <code>--stat</code> | 819 <code>--stat</code> |
820 </dt> | 820 </dt> |
821 <dd> | 821 <dd> |
822 <p> | 822 <p> |
823 This is particularly useful to show <em>which</em> files have been changed in | 823 This is particularly useful to show <em>which</em> files have been changed in |
824 comparison to the upstream branch. | 824 comparison to the upstream branch. |
825 </p> | 825 </p> |
826 </dd> | 826 </dd> |
827 <dt class="hdlist1"> | 827 <dt class="hdlist1"> |
| 828 <code>--staged</code> |
| 829 </dt> |
| 830 <dd> |
| 831 <p> |
| 832 Diff against the staged (cached) changes, instead of against the working |
| 833 directory. This is <em>substantially</em> faster on large repos, but doesnR
17;t take |
| 834 into account unstaged changes (i.e. changes in your working copy which you |
| 835 haven’t staged with <code>git add</code>). |
| 836 </p> |
| 837 </dd> |
| 838 <dt class="hdlist1"> |
828 <code>-- <filename patterns>*</code> | 839 <code>-- <filename patterns>*</code> |
829 </dt> | 840 </dt> |
830 <dd> | 841 <dd> |
831 <p> | 842 <p> |
832 Restrict the diff to only show the diff for given files compared to the | 843 Restrict the diff to only show the diff for given files compared to the |
833 upstream. | 844 upstream. |
834 </p> | 845 </p> |
835 </dd> | 846 </dd> |
836 </dl></div> | 847 </dl></div> |
837 </div></div> | 848 </div></div> |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
873 <div class="sectionbody"> | 884 <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 | 885 <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 | 886 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> | 887 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
here</a>.</p></div> |
877 </div> | 888 </div> |
878 </div> | 889 </div> |
879 </div> | 890 </div> |
880 <div id="footnotes"><hr /></div> | 891 <div id="footnotes"><hr /></div> |
881 <div id="footer"> | 892 <div id="footer"> |
882 <div id="footer-text"> | 893 <div id="footer-text"> |
883 Last updated 2014-04-10 14:23:11 PDT | 894 Last updated 2014-05-07 00:44:20 PDT |
884 </div> | 895 </div> |
885 </div> | 896 </div> |
886 </body> | 897 </body> |
887 </html> | 898 </html> |
OLD | NEW |