aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-checkout-index.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-07 00:29:51 -0800
committerJunio C Hamano <junkio@cox.net>2005-12-07 00:44:30 -0800
commit3bd348aeea24709cd9be4b9d741f79b6014cd7e3 (patch)
tree5b4def422f1e59cea429bee8aae6bc659d7c63c1 /Documentation/git-checkout-index.txt
parent9754563ca9a99bc0fe233f43202af15704fbed4d (diff)
downloadgit-3bd348aeea24709cd9be4b9d741f79b6014cd7e3.tar.gz
git-3bd348aeea24709cd9be4b9d741f79b6014cd7e3.tar.xz
checkout-index: allow checking out from higher stages.
The new option, --stage=<n>, lets you copy out from an unmerged, higher stage. This is to help the new merge world order during a nontrivial merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-checkout-index.txt')
-rw-r--r--Documentation/git-checkout-index.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt
index 97eef22cc..9f32c65aa 100644
--- a/Documentation/git-checkout-index.txt
+++ b/Documentation/git-checkout-index.txt
@@ -9,7 +9,7 @@ git-checkout-index - Copy files from the index to the working directory
SYNOPSIS
--------
'git-checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
- [--] <file>...
+ [--stage=<number>] [--] <file>...
DESCRIPTION
-----------
@@ -40,6 +40,10 @@ OPTIONS
When creating files, prepend <string> (usually a directory
including a trailing /)
+--stage=<number>::
+ Instead of checking out unmerged entries, copy out the
+ files from named stage. <number> must be between 1 and 3.
+
--::
Do not interpret any more arguments as options.