diff options
| -rw-r--r-- | Command/Proxy.hs | 2 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 38 |
2 files changed, 20 insertions, 20 deletions
diff --git a/Command/Proxy.hs b/Command/Proxy.hs index ef0d4b7cd..c34b86c8e 100644 --- a/Command/Proxy.hs +++ b/Command/Proxy.hs @@ -19,7 +19,7 @@ import qualified Git.Sha cmd :: [Command] cmd = [notBareRepo $ command "proxy" ("-- git command") seek - SectionCommon "safely bypass direct mode guard"] + SectionPlumbing "safely bypass direct mode guard"] seek :: CommandSeek seek = withWords start diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 0e302b4b7..0fd5b08a6 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -282,25 +282,6 @@ subdirectories). are on a video hosting site, and the video is downloaded. This allows importing e.g., youtube playlists. -* `proxy -- git cmd [options]` - - Only useful in a direct mode repository, this runs the specified git - command with a temporary work tree, and updates the working tree to - reflect any changes staged or committed by the git command. - - For example, to revert the most recent change that was committed - to the repository: - - git annex proxy -- git revert HEAD - - To check out a past version of the repository: - - git annex proxy -- git checkout HEAD^^ - - To rename a directory: - - git annex proxy -- git mv mydir newname - * `watch` Watches for changes to files in the current directory and its subdirectories, @@ -963,6 +944,25 @@ subdirectories). Most MATCHING OPTIONS can be used with findref, to limit the files it finds. However, the --include and --exclude options will not work. +* `proxy -- git cmd [options]` + + Only useful in a direct mode repository, this runs the specified git + command with a temporary work tree, and updates the working tree to + reflect any changes staged or committed by the git command. + + For example, to revert the most recent change that was committed + to the repository: + + git annex proxy -- git revert HEAD + + To check out a past version of the repository: + + git annex proxy -- git checkout HEAD^^ + + To rename a directory: + + git annex proxy -- git mv mydir newname + * `resolvemerge` Resolves a conflicted merge, by adding both conflicting versions of the |