OLD | NEW |
1 git-upstream-diff(1) | 1 git-upstream-diff(1) |
2 ==================== | 2 ==================== |
3 | 3 |
4 NAME | 4 NAME |
5 ---- | 5 ---- |
6 git-upstream-diff - | 6 git-upstream-diff - |
7 include::_git-upstream-diff_desc.helper.txt[] | 7 include::_git-upstream-diff_desc.helper.txt[] |
8 | 8 |
9 SYNOPSIS | 9 SYNOPSIS |
10 -------- | 10 -------- |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 Print a colorized word-wise diff instead of a line-wise diff. | 42 Print a colorized word-wise diff instead of a line-wise diff. |
43 | 43 |
44 <extra args for git-diff>:: | 44 <extra args for git-diff>:: |
45 Extra arguments are included in the invocation of linkgit:git-diff[1]. These | 45 Extra arguments are included in the invocation of linkgit:git-diff[1]. These |
46 can be anything that `git-diff` normally takes. | 46 can be anything that `git-diff` normally takes. |
47 + | 47 + |
48 -- | 48 -- |
49 `--stat`;; | 49 `--stat`;; |
50 This is particularly useful to show 'which' files have been changed in | 50 This is particularly useful to show 'which' files have been changed in |
51 comparison to the upstream branch. | 51 comparison to the upstream branch. |
| 52 `--staged`;; |
| 53 Diff against the staged (cached) changes, instead of against the working |
| 54 directory. This is 'substantially' faster on large repos, but doesn't take |
| 55 into account unstaged changes (i.e. changes in your working copy which you |
| 56 haven't staged with `git add`). |
52 `-- <filename patterns>*`;; | 57 `-- <filename patterns>*`;; |
53 Restrict the diff to only show the diff for given files compared to the | 58 Restrict the diff to only show the diff for given files compared to the |
54 upstream. | 59 upstream. |
55 -- | 60 -- |
56 | 61 |
57 | 62 |
58 CONFIGURATION VARIABLES | 63 CONFIGURATION VARIABLES |
59 ----------------------- | 64 ----------------------- |
60 | 65 |
61 depot-tools.upstream-diff.default-args | 66 depot-tools.upstream-diff.default-args |
(...skipping 10 matching lines...) Expand all Loading... |
72 git udiff = upstream-diff | 77 git udiff = upstream-diff |
73 ---- | 78 ---- |
74 | 79 |
75 SEE ALSO | 80 SEE ALSO |
76 -------- | 81 -------- |
77 linkgit:git-rebase-update[1] | 82 linkgit:git-rebase-update[1] |
78 | 83 |
79 include::_footer.txt[] | 84 include::_footer.txt[] |
80 | 85 |
81 // vim: ft=asciidoc: | 86 // vim: ft=asciidoc: |
OLD | NEW |