diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-07 11:29:51 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-07 11:44:30 +0300 |
| commit | 3bd348aeea24709cd9be4b9d741f79b6014cd7e3 (patch) | |
| tree | 5b4def422f1e59cea429bee8aae6bc659d7c63c1 /git-merge-one-file.sh | |
| parent | 9754563ca9a99bc0fe233f43202af15704fbed4d (diff) | |
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 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions