summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-10-26 13:57:20 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-10-26 13:57:20 -0400
commitf2c5dac2a88f643b1c68c1f75418576fc3327fae (patch)
tree711de31bc3746595fdfa714cca653b82868a6d03
parent701613f221636958fcbabafd4463f2c52a50c8da (diff)
comment
-rw-r--r--doc/git-annex-unannex.mdwn7
-rw-r--r--doc/git-annex-unannex/comment_2_d325e4201ec2964c5633e00c473df755._comment10
2 files changed, 14 insertions, 3 deletions
diff --git a/doc/git-annex-unannex.mdwn b/doc/git-annex-unannex.mdwn
index 444e1397a..913b83527 100644
--- a/doc/git-annex-unannex.mdwn
+++ b/doc/git-annex-unannex.mdwn
@@ -14,9 +14,10 @@ file back how it was before the add.
Note that for safety, the content of the file remains in the annex,
until you use `git annex unused` and `git annex dropunused`.
-This is not the command you should use if you intentionally annexed a
-file and don't want its contents any more. In that case you should use
-`git annex drop` instead, and you can also `git rm` the file.
+This is not the command you should use if you intentionally added a
+file some time ago, and don't want its contents any more. In that
+case you should use `git annex drop` instead, and you can also
+`git rm` the file.
# OPTIONS
diff --git a/doc/git-annex-unannex/comment_2_d325e4201ec2964c5633e00c473df755._comment b/doc/git-annex-unannex/comment_2_d325e4201ec2964c5633e00c473df755._comment
new file mode 100644
index 000000000..9cec18a0b
--- /dev/null
+++ b/doc/git-annex-unannex/comment_2_d325e4201ec2964c5633e00c473df755._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2016-10-26T17:53:23Z"
+ content="""
+The behavior your comment describes is only the case with v5
+repoitories in indirect mode. With v5 direct mode repositories and
+with the newer v6 repository format, `git annex unannex`
+is able to safely handle files that have been added and not committed yet.
+"""]]