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