赞
踩
NAME
git-reset - Reset current HEAD to the specified state
SYNOPSIS
git reset [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]DESCRIPTION
set the current branch head (
HEAD
) to<commit>
, optionally modifying index and working tree to match.git reset [<mode>] [<commit>]
This form resets the current branch head to
<commit>
and possibly updates the index (resetting it to the tree of<commit>
) and the working tree depending on<mode>
. If<mode>
is omitted, defaults to--mixed
. The<mode>
must be one of the following:--soft
Does not touch the index file or the working tree at all (but resets the head to
<commit>
, just like all modes do). This leaves all your changed files "Changes to be committed", asgit status
would put it.--mixed
Resets the index but not the working tree (i.e., the changed files are preserved but not marked for commit) and reports what has not been updated. This is the default action.
If
-N
is specified, removed paths are marked as intent-to-add (see git-add(1)).--hard
Resets the index and working tree. Any changes to tracked files in the working tree since
<commit>
are discarded. Any untracked files or directories in the way of writing any tracked files are simply deleted.--merge
Resets the index and updates the files in the working tree that are different between
<commit>
andHEAD
, but keeps those which are different between the index and working tree (i.e. which have changes which have not been added). If a file that is different between<commit>
and the index has unstaged changes, reset is aborted.In other words,
--merge
does something like agit read-tree -u -m <commit>
, but carries forward unmerged index entries.--keep
Resets index entries and updates files in the working tree that are different between
<commit>
andHEAD
. If a file that is different between<commit>
andHEAD
has local changes, reset is aborted.--[no-]recurse-submodules
When the working tree is updated, using --recurse-submodules will also recursively reset the working tree of all active submodules according to the commit recorded in the superproject, also setting the submodules' HEAD to be detached at that commit.
See "Reset, restore and revert" in
Copyright © 2003-2013 www.wpsshop.cn 版权所有,并保留所有权利。