* [PATCH] doc: short status for delete + intent-to-add
@ 2018-12-16 17:55 Anthony Sottile
2018-12-16 18:26 ` Duy Nguyen
0 siblings, 1 reply; 2+ messages in thread
From: Anthony Sottile @ 2018-12-16 17:55 UTC (permalink / raw)
To: git; +Cc: Anthony Sottile
$ git rm foo
rm 'foo'
$ touch foo
$ git add --intent-to-add foo
$ git status --short
DA foo
Signed-off-by: Anthony Sottile <asottile@umich.edu>
---
Documentation/git-status.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index d9f422d56..4af7424e5 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -202,7 +202,7 @@ in which case `XY` are `!!`.
[AMD] not updated
M [ MD] updated in index
A [ MD] added to index
- D deleted from index
+ D [ A] deleted from index
R [ MD] renamed in index
C [ MD] copied in index
[MARC] index and work tree matches
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] doc: short status for delete + intent-to-add
2018-12-16 17:55 [PATCH] doc: short status for delete + intent-to-add Anthony Sottile
@ 2018-12-16 18:26 ` Duy Nguyen
0 siblings, 0 replies; 2+ messages in thread
From: Duy Nguyen @ 2018-12-16 18:26 UTC (permalink / raw)
To: Anthony Sottile; +Cc: Git Mailing List
On Sun, Dec 16, 2018 at 7:10 PM Anthony Sottile <asottile@umich.edu> wrote:
>
> $ git rm foo
> rm 'foo'
> $ touch foo
> $ git add --intent-to-add foo
> $ git status --short
> DA foo
Twisted, but not wrong. It may also be a good idea to describe
intent-to-add status, which is probably something like
[ D] A intent to add
>
> Signed-off-by: Anthony Sottile <asottile@umich.edu>
> ---
> Documentation/git-status.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
> index d9f422d56..4af7424e5 100644
> --- a/Documentation/git-status.txt
> +++ b/Documentation/git-status.txt
> @@ -202,7 +202,7 @@ in which case `XY` are `!!`.
> [AMD] not updated
> M [ MD] updated in index
> A [ MD] added to index
> - D deleted from index
> + D [ A] deleted from index
> R [ MD] renamed in index
> C [ MD] copied in index
> [MARC] index and work tree matches
> --
> 2.17.1
>
--
Duy
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-12-16 18:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-16 17:55 [PATCH] doc: short status for delete + intent-to-add Anthony Sottile
2018-12-16 18:26 ` Duy Nguyen
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).