3d50b47ded
Which is the same as the git merge option. After last commit, this turns out to be needed in the test suite, and when doing git-annex import from special remote, followed by a git-annex merge. Sponsored-by: Svenne Krap on Patreon
44 lines
1 KiB
Markdown
44 lines
1 KiB
Markdown
# NAME
|
|
|
|
git-annex merge - merge changes from remotes
|
|
|
|
# SYNOPSIS
|
|
|
|
git annex merge [branch]
|
|
|
|
# DESCRIPTION
|
|
|
|
When run without any parameters, this performs the same merging (and merge
|
|
conflict resolution) that is done by the sync command, but without pushing
|
|
or pulling any data.
|
|
|
|
When a branch to merge is specified, this merges it, using the same merge
|
|
conflict resolution as the sync command. This is especially useful on
|
|
an adjusted branch, because it applies the same adjustment to the
|
|
branch before merging it.
|
|
|
|
When annex.resolvemerge is set to false, merge conflict resolution
|
|
will not be done.
|
|
|
|
# OPTIONS
|
|
|
|
* `--allow-unrelated-histories`, `--no-allow-unrelated-histories`
|
|
|
|
Passed on to `git merge`, to control whether or not to merge
|
|
histories that do not share a common ancestor.
|
|
|
|
* Also, the [[git-annex-common-options]](1) can be used.
|
|
|
|
# SEE ALSO
|
|
|
|
[[git-annex]](1)
|
|
|
|
[[git-annex-sync]](1)
|
|
|
|
[[git-annex-adjust]](1)
|
|
|
|
# AUTHOR
|
|
|
|
Joey Hess <id@joeyh.name>
|
|
|
|
Warning: Automatically converted into a man page by mdwn2man. Edit with care.
|