diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-08-04 14:01:59 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-08-04 14:01:59 -0400 |
| commit | 76bc6f4b653a9dc94709fc3ee511cc877c487ee1 (patch) | |
| tree | fb7b9bacbb8a99a43d9b6e4cda2a24e6a070e389 /doc/git-annex-proxy.mdwn | |
| parent | 5c2eff7f4e56378a807f0c5e2a32f1e65d8da0b6 (diff) | |
proxy: Fix proxy git commit of non-annexed files in direct mode.
* proxy: Fix proxy git commit of non-annexed files in direct mode.
* proxy: If a non-proxied git command, such as git revert
would normally fail because of unstaged files in the work tree,
make the proxied command fail the same way.
Diffstat (limited to 'doc/git-annex-proxy.mdwn')
| -rw-r--r-- | doc/git-annex-proxy.mdwn | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/git-annex-proxy.mdwn b/doc/git-annex-proxy.mdwn index 570789cf7..814cc7676 100644 --- a/doc/git-annex-proxy.mdwn +++ b/doc/git-annex-proxy.mdwn @@ -31,6 +31,14 @@ stage the changes in the index, and then proxy a commit: git annex add myfile git annex proxy -- git commit myfile -m foo +Note that git annex proxy cannot be usefully used with git commands that +look at work tree files. For example, it doesn't make sense to proxy "git +add". This is because the temporary work tree used for proxying doesn't +contain all the files that are in the real work tree. However, any unstaged +work tree files are hard linked (or copied) into the temporary work tree, +so that a command like git revert, that will fail if the change it's +making overwrites work tree files, will behave the same when proxied. + # SEE ALSO [[git-annex]](1) |