diff options
| author |  Johannes Altmanninger <aclopte@gmail.com> | 2021-10-04 21:00:47 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-10-04 13:07:18 -0700 |
| commit | 1566cdd4aea973592ef1871197bc3d6b74b42d7e (patch) | |
| tree | 8ef4ded44580e32ed4abba36ab3014e0af2fdf57 | |
| parent | Git 2.33 (diff) | |
| download | tgif-1566cdd4aea973592ef1871197bc3d6b74b42d7e.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-status.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index 83f38e3198..20f496094a 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -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 |