зеркало из https://github.com/microsoft/git.git
git-reset.txt: reset does not change files in target
git-reset obviously cannot change files in an existing commit. Make it not sound as if it could: reset can change HEAD and, in that sense, can change which state a file in HEAD is in. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
ae8285ed63
Коммит
aad8441483
|
@ -294,8 +294,10 @@ In these tables, A, B, C and D are some different states of a
|
|||
file. For example, the first line of the first table means that if a
|
||||
file is in state A in the working tree, in state B in the index, in
|
||||
state C in HEAD and in state D in the target, then "git reset --soft
|
||||
target" will put the file in state A in the working tree, in state B
|
||||
in the index and in state D in HEAD.
|
||||
target" will leave the file in the working tree in state A and in the
|
||||
index in state B. It resets (i.e. moves) the HEAD (i.e. the tip of
|
||||
the current branch, if you are on one) to "target" (which has the file
|
||||
in state D).
|
||||
|
||||
working index HEAD target working index HEAD
|
||||
----------------------------------------------------
|
||||
|
|
Загрузка…
Ссылка в новой задаче