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 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 23 matching lines...) Expand all Loading... | |
| 34 in a semi-intelligent way. However, sometimes it can produce surprising results, | 34 in a semi-intelligent way. However, sometimes it can produce surprising results, |
| 35 so it is disabled by default. | 35 so it is disabled by default. |
| 36 | 36 |
| 37 | 37 |
| 38 OPTIONS | 38 OPTIONS |
| 39 ------- | 39 ------- |
| 40 | 40 |
| 41 --wordwise:: | 41 --wordwise:: |
| 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 --HEAD:: | |
|
agable
2014/05/07 00:57:48
Not sure how I feel about the flag being capitaliz
iannucci
2014/05/07 01:02:23
Hm, but I don't think `--head` would make sense ei
| |
| 45 Diff against the committed HEAD of your branch instead of your working copy. | |
| 46 This is 'substantially' faster on large repos, but doesn't take into account | |
| 47 uncommitted changes. | |
|
szager1
2014/05/07 06:48:32
unstaged and uncommitted
| |
| 48 | |
| 44 <extra args for git-diff>:: | 49 <extra args for git-diff>:: |
| 45 Extra arguments are included in the invocation of linkgit:git-diff[1]. These | 50 Extra arguments are included in the invocation of linkgit:git-diff[1]. These |
| 46 can be anything that `git-diff` normally takes. | 51 can be anything that `git-diff` normally takes. |
| 47 + | 52 + |
| 48 -- | 53 -- |
| 49 `--stat`;; | 54 `--stat`;; |
| 50 This is particularly useful to show 'which' files have been changed in | 55 This is particularly useful to show 'which' files have been changed in |
| 51 comparison to the upstream branch. | 56 comparison to the upstream branch. |
| 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 |
| (...skipping 18 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 |
