threads / patch / 50047

patchdoc: short status for delete + intent-to-add

Subject: [PATCH] doc: short status for delete + intent-to-add

## tl;dr

2 messages between Dec 16, 2018 and Dec 16, 2018. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Anthony Sottile· Dec 16, 2018, 17:55 UTC · lore

$ 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(-)
Show changes to Documentation/git-status.txt +1 −1
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 Nguyen· Dec 16, 2018, 18:26 UTC · re: Anthony Sottile · lore

Re: [PATCH] doc: short status for delete + intent-to-add

On Sun, Dec 16, 2018 at 7:10 PM Anthony Sottile <asottile@umich.edu> wrote:
Show 7 quoted lines
>
> $ 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
Show 22 quoted lines
>
> 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

← back to recent threads