1git-annex-merge(1) General Commands Manual git-annex-merge(1)
2
3
4
6 git-annex-merge - merge changes from remotes
7
9 git annex merge [branch]
10
12 When run without any parameters, this performs the same merging (and
13 merge conflict resolution) that is done by the sync command, but with‐
14 out pushing or pulling any data.
15
16 When a branch to merge is specified, this merges it, using the same
17 merge conflict resolution as the sync command. This is especially use‐
18 ful on an adjusted branch, because it applies the same adjustment to
19 the branch before merging it.
20
21 When annex.resolvemerge is set to false, merge conflict resolution will
22 not be done.
23
25 --allow-unrelated-histories, --no-allow-unrelated-histories
26
27 Passed on to git merge, to control whether or not to merge his‐
28 tories that do not share a common ancestor.
29
30 Also, the git-annex-common-options(1) can be used.
31
33 git-annex(1)
34
35 git-annex-sync(1)
36
37 git-annex-adjust(1)
38
40 Joey Hess <id@joeyh.name>
41
42 git-annex-merge(1)