Chromium Code Reviews Chromium Code Reviews
Issue 270503003:
Add fast --HEAD option to upstream-diff. (Closed)
Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master| OLD | NEW |
|---|---|
| 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/06/2014 |
| 6 .\" Manual: Chromium depot_tools Manual | 6 .\" Manual: Chromium depot_tools Manual |
| 7 .\" Source: depot_tools 68b1017 | 7 .\" Source: depot_tools 048da08 |
| 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/06/2014" "depot_tools 048da08" "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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 The difference is that HEAD@{upstream} is actually the tagged merge base of your branch (See \fBgit-rebase-update\fR(1))\&. This means that if your upstream bra nch was rebased, but you haven\(cqt yet rebased the current branch on top of it, you\(cqll still see an accurate diff compared to just diffing against @{upstrea m}\&. | 60 The difference is that HEAD@{upstream} is actually the tagged merge base of your branch (See \fBgit-rebase-update\fR(1))\&. This means that if your upstream bra nch was rebased, but you haven\(cqt yet rebased the current branch on top of it, you\(cqll still see an accurate diff compared to just diffing against @{upstrea m}\&. |
| 61 .sp | 61 .sp |
| 62 The \-\-wordwise option also allows git\-diff to do word\-by\-word comparison in a semi\-intelligent way\&. However, sometimes it can produce surprising results , so it is disabled by default\&. | 62 The \-\-wordwise option also allows git\-diff to do word\-by\-word comparison in a semi\-intelligent way\&. However, sometimes it can produce surprising results , so it is disabled by default\&. |
| 63 .SH "OPTIONS" | 63 .SH "OPTIONS" |
| 64 .PP | 64 .PP |
| 65 \-\-wordwise | 65 \-\-wordwise |
| 66 .RS 4 | 66 .RS 4 |
| 67 Print a colorized word\-wise diff instead of a line\-wise diff\&. | 67 Print a colorized word\-wise diff instead of a line\-wise diff\&. |
| 68 .RE | 68 .RE |
| 69 .PP | 69 .PP |
| 70 \-\-HEAD | |
| 71 .RS 4 | |
| 72 Diff against the committed HEAD of your branch instead of your working copy\&. T his is | |
| 73 \fIsubstantially\fR | |
| 74 faster on large repos, but doesn\(cqt take into account uncommitted changes\&. | |
|
szager1
2014/05/07 06:48:32
unstaged and uncommitted
| |
| 75 .RE | |
| 76 .PP | |
| 70 <extra args for git\-diff> | 77 <extra args for git\-diff> |
| 71 .RS 4 | 78 .RS 4 |
| 72 Extra arguments are included in the invocation of | 79 Extra arguments are included in the invocation of |
| 73 \fBgit-diff\fR(1)\&. These can be anything that | 80 \fBgit-diff\fR(1)\&. These can be anything that |
| 74 git\-diff | 81 git\-diff |
| 75 normally takes\&. | 82 normally takes\&. |
| 76 .PP | 83 .PP |
| 77 \-\-stat | 84 \-\-stat |
| 78 .RS 4 | 85 .RS 4 |
| 79 This is particularly useful to show | 86 This is particularly useful to show |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 110 \fBgit-rebase-update\fR(1) | 117 \fBgit-rebase-update\fR(1) |
| 111 .SH "CHROMIUM DEPOT_TOOLS" | 118 .SH "CHROMIUM DEPOT_TOOLS" |
| 112 .sp | 119 .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\&. | 120 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" | 121 .SH "NOTES" |
| 115 .IP " 1." 4 | 122 .IP " 1." 4 |
| 116 here | 123 here |
| 117 .RS 4 | 124 .RS 4 |
| 118 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git | 125 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git |
| 119 .RE | 126 .RE |
| OLD | NEW |
