summaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-06-22 18:46:45 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-06-22 18:46:56 -0400
commitad3770e0b203b32a07fa142d6d83c980b23310ee (patch)
treed07022b5d9b7628701a737e3d3042680e2998770 /doc/git-annex.mdwn
parent80302d0b46c5d45df1cf290796e0e27d9264ece8 (diff)
add merge subcommand
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn11
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index ced6fc1b3..1cb079ae9 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -182,6 +182,13 @@ Many git-annex commands will stage changes for later `git commit` by you.
Displays a list of repositories known to contain the content of the
specified file or files.
+* merge
+
+ Automatically merges any changes from remotes into the git-annex branch.
+ While git-annex mostly handles keeping the git-annex branch merged
+ automatically, if you find you are unable to push the git-annex branch
+ due non-fast-forward, this will fix it.
+
* status
Displays some statistics and other information, including how much data
@@ -301,9 +308,7 @@ Many git-annex commands will stage changes for later `git commit` by you.
* upgrade
- Upgrades the repository to current layout. Upgrades are done automatically
- whenever a newer git annex encounters an old repository; this command
- allows explcitly starting an upgrade.
+ Upgrades the repository to current layout.
* version