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 /git-merge-octopus.sh | |
| 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>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions