OLD | NEW |
(Empty) | |
| 1 git-upstream-diff(1) |
| 2 ==================== |
| 3 |
| 4 NAME |
| 5 ---- |
| 6 git-upstream-diff - |
| 7 include::_git-upstream-diff_desc.helper.txt[] |
| 8 |
| 9 SYNOPSIS |
| 10 -------- |
| 11 [verse] |
| 12 'git upstream-diff' [--wordwise] [<extra args for git-diff>*] |
| 13 |
| 14 DESCRIPTION |
| 15 ----------- |
| 16 |
| 17 Shows a diff beween your current branch and it's upstream. This is 'roughly' the |
| 18 same as: |
| 19 |
| 20 ---- |
| 21 git diff --patience -C -C HEAD@{upstream} <1> <2> |
| 22 ---- |
| 23 <1> `-C -C` detects file copies/renames |
| 24 <2> `--patience` uses the patience-diff algorithm, which tends to produce nicer |
| 25 diffs in many cases. |
| 26 |
| 27 The difference is that `HEAD@{upstream}` is actually the tagged merge base of |
| 28 your branch (See linkgit:git-rebase-update[1]). This means that if your upstream |
| 29 branch was rebased, but you haven't yet rebased the current branch on top of it, |
| 30 you'll still see an accurate diff compared to just diffing against |
| 31 `@{upstream}`. |
| 32 |
| 33 The `--wordwise` option also allows `git-diff` to do word-by-word comparison |
| 34 in a semi-intelligent way. However, sometimes it can produce surprising results, |
| 35 so it is disabled by default. |
| 36 |
| 37 |
| 38 OPTIONS |
| 39 ------- |
| 40 |
| 41 --wordwise:: |
| 42 Print a colorized word-wise diff instead of a line-wise diff. |
| 43 |
| 44 <extra args for git-diff>:: |
| 45 Extra arguments are included in the invocation of linkgit:git-diff[1]. These |
| 46 can be anything that `git-diff` normally takes. |
| 47 + |
| 48 -- |
| 49 `--stat`;; |
| 50 This is particularly useful to show 'which' files have been changed in |
| 51 comparison to the upstream branch. |
| 52 `-- <filename patterns>*`;; |
| 53 Restrict the diff to only show the diff for given files compared to the |
| 54 upstream. |
| 55 -- |
| 56 |
| 57 |
| 58 CONFIGURATION VARIABLES |
| 59 ----------------------- |
| 60 |
| 61 depot-tools.upstream-diff.default-args |
| 62 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 63 |
| 64 A list-configuration variable. Each instance of this config variable will be |
| 65 prepended to all invocations of `git upstream-diff`, as if you had passed them |
| 66 on the command line. |
| 67 |
| 68 include::_aliases.txt[] |
| 69 |
| 70 ---- |
| 71 [alias] |
| 72 git udiff = upstream-diff |
| 73 ---- |
| 74 |
| 75 SEE ALSO |
| 76 -------- |
| 77 linkgit:git-rebase-update[1] |
| 78 |
| 79 include::_footer.txt[] |
| 80 |
| 81 // vim: ft=asciidoc: |
OLD | NEW |