aboutsummaryrefslogtreecommitdiff
path: root/doc/git-annex-merge.mdwn
blob: a86886e75f676b6b702a436b1b9530157ef91d02 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
# 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)

[[git-annex-sync]](1)

# AUTHOR

Joey Hess <id@joeyh.name>

Warning: Automatically converted into a man page by mdwn2man. Edit with care.