mirror of
https://github.com/git/git.git
synced 2024-11-06 01:03:02 +01:00
740afd9613
Schedule git-diff-stages and git-resolve to be removed by 1.5.1 Signed-off-by: Junio C Hamano <junkio@cox.net>
42 lines
669 B
Text
42 lines
669 B
Text
git-diff-stages(1)
|
|
==================
|
|
|
|
NAME
|
|
----
|
|
git-diff-stages - Compares two merge stages in the index
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'git-diff-stages' [<common diff options>] <stage1> <stage2> [<path>...]
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
DEPRECATED and will be removed in 1.5.1.
|
|
|
|
Compares the content and mode of the blobs in two stages in an
|
|
unmerged index file.
|
|
|
|
OPTIONS
|
|
-------
|
|
include::diff-options.txt[]
|
|
|
|
<stage1>,<stage2>::
|
|
The stage number to be compared.
|
|
|
|
Output format
|
|
-------------
|
|
include::diff-format.txt[]
|
|
|
|
|
|
Author
|
|
------
|
|
Written by Junio C Hamano <junkio@cox.net>
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by Junio C Hamano.
|
|
|
|
GIT
|
|
---
|
|
Part of the gitlink:git[7] suite
|