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

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

Issue 259863004: Move docs folder to man. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: 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 | « docs/man1/git-thaw.1 ('k') | docs/man7/depot_tools.7 » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 '\" t
2 .\" Title: git-upstream-diff
3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5 .\" Date: 04/10/2014
6 .\" Manual: Chromium depot_tools Manual
7 .\" Source: depot_tools 68b1017
8 .\" Language: English
9 .\"
10 .TH "GIT\-UPSTREAM\-DIFF" "1" "04/10/2014" "depot_tools 68b1017" "Chromium depot _tools Manual"
11 .\" -----------------------------------------------------------------
12 .\" * Define some portability stuff
13 .\" -----------------------------------------------------------------
14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
15 .\" http://bugs.debian.org/507673
16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18 .ie \n(.g .ds Aq \(aq
19 .el .ds Aq '
20 .\" -----------------------------------------------------------------
21 .\" * set default formatting
22 .\" -----------------------------------------------------------------
23 .\" disable hyphenation
24 .nh
25 .\" disable justification (adjust text to left margin only)
26 .ad l
27 .\" -----------------------------------------------------------------
28 .\" * MAIN CONTENT STARTS HERE *
29 .\" -----------------------------------------------------------------
30 .SH "NAME"
31 git-upstream-diff \- Print a diff of the current branch, compared to its upstrea m\&.
32 .SH "SYNOPSIS"
33 .sp
34 .nf
35 \fIgit upstream\-diff\fR [\-\-wordwise] [<extra args for git\-diff>*]
36 .fi
37 .sp
38 .SH "DESCRIPTION"
39 .sp
40 Shows a diff beween your current branch and it\(cqs upstream\&. This is \fIrough ly\fR the same as:
41 .sp
42 .if n \{\
43 .RS 4
44 .\}
45 .nf
46 git diff \-\-patience \-C \-C HEAD@{upstream} \fB(1)\fR \fB(2)\fR
47 .fi
48 .if n \{\
49 .RE
50 .\}
51 .sp
52 .sp
53 \fB1. \fR\-C \-C
54 detects file copies/renames
55 .br
56 \fB2. \fR\-\-patience
57 uses the patience\-diff algorithm, which tends to produce nicer diffs in many ca ses\&.
58 .br
59 .sp
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
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"
64 .PP
65 \-\-wordwise
66 .RS 4
67 Print a colorized word\-wise diff instead of a line\-wise diff\&.
68 .RE
69 .PP
70 <extra args for git\-diff>
71 .RS 4
72 Extra arguments are included in the invocation of
73 \fBgit-diff\fR(1)\&. These can be anything that
74 git\-diff
75 normally takes\&.
76 .PP
77 \-\-stat
78 .RS 4
79 This is particularly useful to show
80 \fIwhich\fR
81 files have been changed in comparison to the upstream branch\&.
82 .RE
83 .PP
84 \-\- <filename patterns>*
85 .RS 4
86 Restrict the diff to only show the diff for given files compared to the upstream \&.
87 .RE
88 .RE
89 .SH "CONFIGURATION VARIABLES"
90 .SS "depot\-tools\&.upstream\-diff\&.default\-args"
91 .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\&.
93 .SH "SUGGESTED ALIASES"
94 .sp
95 Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon fig\fR file\&.
96 .sp
97 .if n \{\
98 .RS 4
99 .\}
100 .nf
101 [alias]
102 git udiff = upstream\-diff
103 .fi
104 .if n \{\
105 .RE
106 .\}
107 .sp
108 .SH "SEE ALSO"
109 .sp
110 \fBgit-rebase-update\fR(1)
111 .SH "CHROMIUM DEPOT_TOOLS"
112 .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\&.
114 .SH "NOTES"
115 .IP " 1." 4
116 here
117 .RS 4
118 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git
119 .RE
OLDNEW
« no previous file with comments | « docs/man1/git-thaw.1 ('k') | docs/man7/depot_tools.7 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698