diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-29 11:42:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-29 11:42:35 -0400 |
| commit | af45d422248846869babdbc3eae2765d94ea9f20 (patch) | |
| tree | 6f1bea8cc19dedcd8ca40c046718f7f96e7454f8 /doc/git-annex.mdwn | |
| parent | 5034d8c2985dafeb141bba383ab70d75729b3cb6 (diff) | |
| parent | b3aaf980e460c2287fc1ef2b262685b1879e6ed0 (diff) | |
Merge branch 'master' into v3
Conflicts:
debian/changelog
Diffstat (limited to 'doc/git-annex.mdwn')
| -rw-r--r-- | doc/git-annex.mdwn | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 4f02db12f..a5ddf3172 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -319,7 +319,8 @@ Many git-annex commands will stage changes for later `git commit` by you. * --force Force unsafe actions, such as dropping a file's content when no other - source of it can be verified to still exist. Use with care. + source of it can be verified to still exist, or adding ignored files. + Use with care. * --fast |