mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Documentation/git-status: remove impossible porcelain status DR and DC
Commit 176ea74793
("wt-status.c: handle worktree renames", 2017-12-27)
made a porcelain status like .R or .C possible. They occur only when
the source file is added to the index and the destination file is
added with --intent-to-add.
They also documented DR, but that status is impossible. The index
change D means that the source file does not exist in the index.
The worktree change R/C states that the file has been renamed/copied
since the index, but that's impossible if it did not exist there.
Reported-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Johannes Altmanninger <aclopte@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
225bc32a98
commit
1566cdd4ae
|
@ -225,8 +225,8 @@ C [ MD] copied in index
|
|||
[MARC] index and work tree matches
|
||||
[ MARC] M work tree changed since index
|
||||
[ MARC] D deleted in work tree
|
||||
[ D] R renamed in work tree
|
||||
[ D] C copied in work tree
|
||||
R renamed in work tree
|
||||
C copied in work tree
|
||||
-------------------------------------------------
|
||||
D D unmerged, both deleted
|
||||
A U unmerged, added by us
|
||||
|
|
Loading…
Reference in a new issue