summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-09-22 17:32:28 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-09-22 17:32:28 -0400
commit6dc0db8df4324497ce666231a1d458ac6ee6c9ee (patch)
tree3adccac08e5411413607d749859f5f6fbe2cc07f /doc
parent94e8b0e08e5a5f630eea17700294b1783b190e67 (diff)
status: Show added but not yet committed files.
Seems easy, but git ls-files can't list the right subset of files. So, I wrote a whole new parser for git status output, and converted the status command to use that. There are a few other small behavior changes. The order changed. Unlocked files show as T. In indirect mode, deleted files were not shown before, and that's fixed. Regular files checked directly into git and modified were not shown before, and are now.
Diffstat (limited to 'doc')
-rw-r--r--doc/git-annex-status.mdwn6
-rw-r--r--doc/todo/make_status_show_staged_files.mdwn2
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/git-annex-status.mdwn b/doc/git-annex-status.mdwn
index 7ad967bde..19bd6fab5 100644
--- a/doc/git-annex-status.mdwn
+++ b/doc/git-annex-status.mdwn
@@ -9,8 +9,10 @@ git annex status `[path ...]`
# DESCRIPTION
Similar to `git status --short`, this command displays the status of the files
-in the working tree. Shows files that are not checked into git, files that have
-been deleted, and files that have been modified.
+in the working tree.
+
+Show files that are not checked into git (?), deleted (D),
+modified (M), added but not committed (A), and type changed/unlocked (T).
Particularly useful in direct mode.
diff --git a/doc/todo/make_status_show_staged_files.mdwn b/doc/todo/make_status_show_staged_files.mdwn
index cd2de5bce..4d418bc11 100644
--- a/doc/todo/make_status_show_staged_files.mdwn
+++ b/doc/todo/make_status_show_staged_files.mdwn
@@ -21,3 +21,5 @@ Using the `git status` command directly will show the added files
### What version of git-annex are you using? On what operating system?
git-annex version: 5.20141024-g613f396
+
+> [[done]] --[[Joey]]