summaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-11-13 13:59:00 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-11-13 13:59:00 -0400
commit49e97f31528351af46437bcccfa645d949bc85a1 (patch)
tree2ba8d989e93ae6909a3040bab4adef51dd47f126 /doc/git-annex.mdwn
parent1210b5098e3e4212832128fdb59916d88090ab42 (diff)
proxy command is closer to plumbing than a general use command
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn38
1 files changed, 19 insertions, 19 deletions
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