mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

proxy command is closer to plumbing than a general use command

Browse source
This commit is contained in:
Joey Hess 2014-11-13 13:59:00 -04:00
parent fc7bdf9779
commit d22d650f59
2 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Command/Proxy.hs
View file

@ -19,7 +19,7 @@ import qualified Git.Sha
cmd :: [Command] cmd :: [Command]
cmd = [notBareRepo $ cmd = [notBareRepo $
command "proxy" ("-- git command") seek command "proxy" ("-- git command") seek
SectionCommon "safely bypass direct mode guard"] SectionPlumbing "safely bypass direct mode guard"]
seek :: CommandSeek seek :: CommandSeek
seek = withWords start seek = withWords start

38
doc/git-annex.mdwn
View file

@ -282,25 +282,6 @@ subdirectories).
are on a video hosting site, and the video is downloaded. This allows are on a video hosting site, and the video is downloaded. This allows
importing e.g., youtube playlists. 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` * `watch`
Watches for changes to files in the current directory and its subdirectories, 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 Most MATCHING OPTIONS can be used with findref, to limit the files it
finds. However, the --include and --exclude options will not work. 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` * `resolvemerge`
Resolves a conflicted merge, by adding both conflicting versions of the Resolves a conflicted merge, by adding both conflicting versions of the