projects / thirdparty / git.git / blame
| Commit | Line | Data |
|---|---|---|
| 232b75ab JH |
1 | git-diff-stages(1) |
| 2 | ================== | |
| 232b75ab JH |
3 | |
| 4 | NAME | |
| 5 | ---- | |
| 6 | git-diff-stages - Compares content and mode of blobs between stages in an unmerged index file. | |
| 7 | ||
| 8 | ||
| 9 | SYNOPSIS | |
| 10 | -------- | |
| dda2d79a | 11 | 'git-diff-stages' [<common diff options>] <stage1> <stage2> [<path>...] |
| 232b75ab JH |
12 | |
| 13 | DESCRIPTION | |
| 14 | ----------- | |
| 15 | Compares the content and mode of the blobs in two stages in an | |
| 16 | unmerged index file. | |
| 17 | ||
| 18 | OPTIONS | |
| 19 | ------- | |
| dda2d79a JH |
20 | include::diff-options.txt[] |
| 21 | ||
| 232b75ab JH |
22 | <stage1>,<stage2>:: |
| 23 | The stage number to be compared. | |
| 24 | ||
| 232b75ab JH |
25 | Output format |
| 26 | ------------- | |
| 27 | include::diff-format.txt[] | |
| 28 | ||
| 29 | ||
| 30 | Author | |
| 31 | ------ | |
| 32 | Written by Junio C Hamano <junkio@cox.net> | |
| 33 | ||
| 34 | Documentation | |
| 35 | -------------- | |
| 36 | Documentation by Junio C Hamano. | |
| 37 | ||
| 38 | GIT | |
| 39 | --- | |
| a7154e91 | 40 | Part of the gitlink:git[7] suite |