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

add merge subcommand

Browse source
This commit is contained in:
Joey Hess 2011-06-22 18:46:45 -04:00
parent 80302d0b46
commit ad3770e0b2
5 changed files with 42 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
doc/git-annex.mdwn
View file

@ -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