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

Side by Side Diff: man/man1/git-upstream-diff.1

Issue 270503003: Add fast --HEAD option to upstream-diff. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Just document --staged Created 6 years, 7 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 | « man/html/git-upstream-diff.html ('k') | man/src/git-upstream-diff.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 '\" t 1 '\" t
2 .\" Title: git-upstream-diff 2 .\" Title: git-upstream-diff
3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] 3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> 4 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5 .\" Date: 04/10/2014 5 .\" Date: 05/07/2014
6 .\" Manual: Chromium depot_tools Manual 6 .\" Manual: Chromium depot_tools Manual
7 .\" Source: depot_tools 68b1017 7 .\" Source: depot_tools cab11c5
8 .\" Language: English 8 .\" Language: English
9 .\" 9 .\"
10 .TH "GIT\-UPSTREAM\-DIFF" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot _tools Manual" 10 .TH "GIT\-UPSTREAM\-DIFF" "1" "05/07/2014" "depot_tools cab11c5" "Chromium depot _tools Manual"
11 .\" ----------------------------------------------------------------- 11 .\" -----------------------------------------------------------------
12 .\" * Define some portability stuff 12 .\" * Define some portability stuff
13 .\" ----------------------------------------------------------------- 13 .\" -----------------------------------------------------------------
14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
15 .\" http://bugs.debian.org/507673 15 .\" http://bugs.debian.org/507673
16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html 16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18 .ie \n(.g .ds Aq \(aq 18 .ie \n(.g .ds Aq \(aq
19 .el .ds Aq ' 19 .el .ds Aq '
20 .\" ----------------------------------------------------------------- 20 .\" -----------------------------------------------------------------
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 git\-diff 74 git\-diff
75 normally takes\&. 75 normally takes\&.
76 .PP 76 .PP
77 \-\-stat 77 \-\-stat
78 .RS 4 78 .RS 4
79 This is particularly useful to show 79 This is particularly useful to show
80 \fIwhich\fR 80 \fIwhich\fR
81 files have been changed in comparison to the upstream branch\&. 81 files have been changed in comparison to the upstream branch\&.
82 .RE 82 .RE
83 .PP 83 .PP
84 \-\-staged
85 .RS 4
86 Diff against the staged (cached) changes, instead of against the working directo ry\&. This is
87 \fIsubstantially\fR
88 faster on large repos, but doesn\(cqt take into account unstaged changes (i\&.e\ &. changes in your working copy which you haven\(cqt staged with
89 git add)\&.
90 .RE
91 .PP
84 \-\- <filename patterns>* 92 \-\- <filename patterns>*
85 .RS 4 93 .RS 4
86 Restrict the diff to only show the diff for given files compared to the upstream \&. 94 Restrict the diff to only show the diff for given files compared to the upstream \&.
87 .RE 95 .RE
88 .RE 96 .RE
89 .SH "CONFIGURATION VARIABLES" 97 .SH "CONFIGURATION VARIABLES"
90 .SS "depot\-tools\&.upstream\-diff\&.default\-args" 98 .SS "depot\-tools\&.upstream\-diff\&.default\-args"
91 .sp 99 .sp
92 A list\-configuration variable\&. Each instance of this config variable will be prepended to all invocations of git upstream\-diff, as if you had passed them on the command line\&. 100 A list\-configuration variable\&. Each instance of this config variable will be prepended to all invocations of git upstream\-diff, as if you had passed them on the command line\&.
93 .SH "SUGGESTED ALIASES" 101 .SH "SUGGESTED ALIASES"
(...skipping 16 matching lines...) Expand all
110 \fBgit-rebase-update\fR(1) 118 \fBgit-rebase-update\fR(1)
111 .SH "CHROMIUM DEPOT_TOOLS" 119 .SH "CHROMIUM DEPOT_TOOLS"
112 .sp 120 .sp
113 Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi st with the development of chromium and related projects\&. Download the tools f rom \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&. 121 Part of the chromium \fBdepot_tools\fR(7) suite\&. These tools are meant to assi st with the development of chromium and related projects\&. Download the tools f rom \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&.
114 .SH "NOTES" 122 .SH "NOTES"
115 .IP " 1." 4 123 .IP " 1." 4
116 here 124 here
117 .RS 4 125 .RS 4
118 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git 126 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git
119 .RE 127 .RE
OLDNEW
« no previous file with comments | « man/html/git-upstream-diff.html ('k') | man/src/git-upstream-diff.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698