diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-03-23 15:36:10 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-03-23 15:36:10 -0400 |
| commit | 90c35465528195367cc4ed1e15478285d7b063f3 (patch) | |
| tree | fc658fb5d483ad673d82bfa5c3d00bc4a7c2d5ef /doc/git-annex-merge.mdwn | |
| parent | 052e77469015e82ca33733388ff5740fa06312e2 (diff) | |
splitting up the man page
Common command man pages all split out and often expanded.
A few sections split out into their own pages.
Still need to do all the other commands..
Diffstat (limited to 'doc/git-annex-merge.mdwn')
| -rw-r--r-- | doc/git-annex-merge.mdwn | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/doc/git-annex-merge.mdwn b/doc/git-annex-merge.mdwn new file mode 100644 index 000000000..346a94790 --- /dev/null +++ b/doc/git-annex-merge.mdwn @@ -0,0 +1,27 @@ +# NAME + +git-annex merge - automatically merge changes from remotes + +# SYNOPSIS + +git annex merge + +# DESCRIPTION + +This performs the same merging (and merge conflict resolution) +that is done by the sync command, but without pushing or pulling any +data. + +One way to use this is to put `git annex merge` into a repository's +post-receive hook. Then any syncs to the repository will update its +working copy automatically. + +# SEE ALSO + +[[git-annex]](1) + +# AUTHOR + +Joey Hess <id@joeyh.name> + +Warning: Automatically converted into a man page by mdwn2man. Edit with care. |