Merge master.kernel.org:/pub/scm/gitk/gitk
[git.git] / Documentation / git-diff-stages.txt
1 git-diff-stages(1)
2 ==================
3 v0.1, June 2005
4
5 NAME
6 ----
7 git-diff-stages - Compares content and mode of blobs between stages in an unmerged index file.
8
9
10 SYNOPSIS
11 --------
12 'git-diff-stages' [<common diff options>] <stage1> <stage2> [<path>...]
13
14 DESCRIPTION
15 -----------
16 Compares the content and mode of the blobs in two stages in an
17 unmerged index file.
18
19 OPTIONS
20 -------
21 include::diff-options.txt[]
22
23 <stage1>,<stage2>::
24         The stage number to be compared.
25
26 Output format
27 -------------
28 include::diff-format.txt[]
29
30
31 Author
32 ------
33 Written by Junio C Hamano <junkio@cox.net>
34
35 Documentation
36 --------------
37 Documentation by Junio C Hamano.
38
39 GIT
40 ---
41 Part of the link:git.html[git] suite